[Libreoffice-commits] .: 6 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc filter/inc filter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 2 03:09:05 PDT 2011
binfilter/bf_basic/source/classes/image.cxx | 28 --
binfilter/bf_basic/source/sbx/sbxbase.cxx | 8
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 22 -
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 21 -
binfilter/bf_sc/source/core/data/sc_documen8.cxx | 57 ----
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 13 -
binfilter/bf_sc/source/ui/inc/docsh.hxx | 1
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 18 -
binfilter/bf_sch/source/core/sch_objid.cxx | 72 ------
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 8
binfilter/bf_so3/source/inplace/client.cxx | 27 --
binfilter/bf_so3/source/inplace/embobj.cxx | 8
binfilter/bf_so3/source/inplace/ipclient.cxx | 8
binfilter/bf_so3/source/inplace/ipobj.cxx | 21 -
binfilter/bf_so3/source/inplace/protocol.cxx | 30 --
binfilter/bf_so3/source/misc/iface.cxx | 24 --
binfilter/bf_so3/source/persist/persist.cxx | 7
binfilter/bf_starmath/source/starmath_utility.cxx | 49 ----
binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx | 1
binfilter/bf_svtools/source/items1/whassert.hxx | 10
binfilter/bf_svtools/source/misc/makefile.mk | 3
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 9
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 19 -
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 10
binfilter/bf_svx/source/svdraw/svx_svdio.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 3
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 19 -
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 37 ---
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 6
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 18 -
binfilter/bf_sw/source/core/text/porlay.hxx | 5
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 46 ---
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 31 --
binfilter/bf_sw/source/filter/w4w/makefile.mk | 2
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 178 ---------------
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 12 -
binfilter/inc/bf_sc/document.hxx | 3
binfilter/inc/bf_sch/objid.hxx | 5
binfilter/inc/bf_starmath/utility.hxx | 2
binfilter/inc/bf_svtools/zformat.hxx | 6
binfilter/inc/bf_sw/crsrsh.hxx | 7
binfilter/inc/bf_sw/doc.hxx | 1
binfilter/inc/bf_sw/tox.hxx | 3
binfilter/inc/bf_tools/string.hxx | 41 +++
filter/inc/filter/msfilter/msdffimp.hxx | 1
filter/source/msfilter/msdffimp.cxx | 45 ---
46 files changed, 91 insertions(+), 868 deletions(-)
New commits:
commit 6b332a25d7b413e24d05928343f6e4e943e725b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 2 09:46:46 2011 +0100
convert in one pass, rather than point by point
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 84d7421..7d6e923 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -143,6 +143,7 @@
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx"
#include <rtl/strbuf.hxx>
+#include <boost/scoped_array.hpp>
using namespace ::com::sun::star ;
using namespace ::com::sun::star::drawing;
@@ -4126,16 +4127,14 @@ void SvxMSDffManager::MSDFFReadZString( SvStream& rIn, String& rStr,
sal_uInt16 nLen = (sal_uInt16)nRecLen;
if( nLen )
{
- if ( bUniCode )
- nLen >>= 1;
-
String sBuf;
- sal_Unicode* pBuf = sBuf.AllocBuffer( nLen );
if( bUniCode )
{
- rIn.Read( (sal_Char*)pBuf, nLen << 1 );
+ nLen >>= 1;
+ sal_Unicode* pBuf = sBuf.AllocBuffer(nLen);
+ rIn.Read( (sal_Char*)pBuf, nLen << 1 );
#ifdef OSL_BIGENDIAN
for( sal_uInt16 n = 0; n < nLen; ++n, ++pBuf )
*pBuf = SWAPSHORT( *pBuf );
@@ -4143,12 +4142,9 @@ void SvxMSDffManager::MSDFFReadZString( SvStream& rIn, String& rStr,
}
else
{
- // use the String-Data as buffer for the 8bit characters and
- // change then all to unicode
- sal_Char* pReadPos = ((sal_Char*)pBuf) + nLen;
- rIn.Read( (sal_Char*)pReadPos, nLen );
- for( sal_uInt16 n = 0; n < nLen; ++n, ++pBuf, ++pReadPos )
- *pBuf = ByteString::ConvertToUnicode( *pReadPos, RTL_TEXTENCODING_MS_1252 );
+ boost::scoped_array<sal_Char> xBuffer(new sal_Char[nLen]);
+ nLen = rIn.Read(xBuffer.get(), nLen);
+ sBuf = rtl::OUString(xBuffer.get(), nLen, RTL_TEXTENCODING_MS_1252);
}
rStr = sBuf.EraseTrailingChars( 0 );
commit b9459499d951d4530d6a271e0f0bc42b22c03130
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 2 09:10:34 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index fcba7cb..fe73f1a 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1478,18 +1478,6 @@ void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
}
}
-
-BOOL SvNumberformat::HasNewCurrency() const
-{
- for ( USHORT j=0; j<4; j++ )
- {
- if ( NumFor[j].HasNewCurrency() )
- return TRUE;
- }
- return FALSE;
-}
-
-
BOOL SvNumberformat::GetNewCurrencySymbol( String& rSymbol,
String& rExtension ) const
{
@@ -1553,13 +1541,6 @@ String SvNumberformat::StripNewCurrencyDelimiters( const String& rStr,
return aTmp;
}
-
-void SvNumberformat::Build50Formatstring( String& rStr ) const
-{
- rStr = StripNewCurrencyDelimiters( sFormatstring, TRUE );
-}
-
-
void SvNumberformat::ImpGetOutputStandard(double& fNumber, String& OutString)
{
USHORT nStandardPrec = rScan.GetStandardPrec();
diff --git a/binfilter/inc/bf_svtools/zformat.hxx b/binfilter/inc/bf_svtools/zformat.hxx
index 8997466..f105118 100644
--- a/binfilter/inc/bf_svtools/zformat.hxx
+++ b/binfilter/inc/bf_svtools/zformat.hxx
@@ -312,12 +312,6 @@ public:
// Whether the negative format is without a sign or not
BOOL IsNegativeWithoutSign() const;
- // Whether a new SYMBOLTYPE_CURRENCY is contained in the format
- BOOL HasNewCurrency() const;
-
- // Build string from NewCurrency for saving it SO50 compatible
- void Build50Formatstring( String& rStr ) const;
-
// strip [$-yyy] from all [$xxx-yyy] leaving only xxx's,
// if bQuoteSymbol==TRUE the xxx will become "xxx"
static String StripNewCurrencyDelimiters( const String& rStr,
commit 16cb77cc2c52875757f6b67abbe688f139bc0258
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 31 23:52:57 2011 +0100
callcatcher: remove unused code
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 51bd8da..4b47231 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -532,7 +532,6 @@ protected :
const int _nCalledByGroup,
sal_Int64 nAspect ) const;
SdrObject* GetAutoForm( MSO_SPT eTyp ) const;
- static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf );
static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj(
sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index ac9f128..84d7421 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7026,33 +7026,6 @@ SdrObject* SvxMSDffManager::ImportOLE( long nOLEId,
return pRet;
}
-const GDIMetaFile* SvxMSDffManager::lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf,
- GDIMetaFile& rMtf )
-{
- const GDIMetaFile* pMtf;
- if( GRAPHIC_BITMAP == rGrf.GetType() )
- {
- Point aPt;
- const Size aSz(lcl_GetPrefSize(rGrf, MAP_100TH_MM));
-
- VirtualDevice aVirtDev;
- aVirtDev.EnableOutput( sal_False );
- MapMode aMM(MAP_100TH_MM);
- aVirtDev.SetMapMode( aMM );
-
- rMtf.Record( &aVirtDev );
- rGrf.Draw( &aVirtDev, aPt, aSz );
- rMtf.Stop();
- rMtf.SetPrefMapMode(aMM);
- rMtf.SetPrefSize( aSz );
-
- pMtf = &rMtf;
- }
- else
- pMtf = &rGrf.GetGDIMetaFile();
- return pMtf;
-}
-
sal_Bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile & rMtf )
{
String aPersistStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
commit a6a6c1181f8e9ed9565b2c5f068908585837d9c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 31 23:51:49 2011 +0100
callcatcher: remove unused code
diff --git a/binfilter/bf_basic/source/classes/image.cxx b/binfilter/bf_basic/source/classes/image.cxx
index cecf102..69f61e4 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -89,34 +89,6 @@ BOOL SbiGood( SvStream& r )
return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
}
-// Oeffnen eines Records
-
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
-{
- ULONG nPos = r.Tell();
- r << nSignature << (INT32) 0 << nElem;
- return nPos;
-}
-
-// Schliessen eines Records
-
-void SbiCloseRecord( SvStream& r, ULONG nOff )
-{
- ULONG nPos = r.Tell();
- r.Seek( nOff + 2 );
- r << (INT32) ( nPos - nOff - 8 );
- r.Seek( nPos );
-}
-
-/**************************************************************************
-*
-* Laden und Speichern
-*
-**************************************************************************/
-
-// Falls die Versionsnummer nicht passt, werden die binaeren Teile
-// nicht geladen, wohl aber Source, Kommentar und Name.
-
BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
{
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index f046cd3..a3ab89d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -106,22 +106,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ void ScDocument::ImplSaveDocOptions( SvStream& rStream ) const
-/*N*/ {
-/*N*/ DBG_ASSERT( pDocOptions, "No DocOptions to save! :-(" );
-/*N*/ pDocOptions->Save( rStream );
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-/*N*/ void ScDocument::ImplSaveViewOptions( SvStream& rStream ) const
-/*N*/ {
-/*N*/ DBG_ASSERT( pViewOptions, "No ViewOptions to save! :-(" );
-/*N*/ rStream << *pViewOptions;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ void ScDocument::ImplCreateOptions()
/*N*/ {
/*N*/ pDocOptions = new ScDocOptions();
@@ -517,47 +501,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void ScDocument::SaveAreaLinks(SvStream& rStream) const
-/*N*/ {
-/*N*/ const ::binfilter::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-/*N*/ USHORT nCount = rLinks.Count();
-/*N*/
-/*N*/ // erstmal zaehlen...
-/*N*/
-/*N*/ USHORT nAreaCount = 0;
-/*N*/ USHORT i;
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ if ((*rLinks[i])->ISA(ScAreaLink)) // rLinks[i] = Pointer auf Ref
-/*N*/ ++nAreaCount;
-/*N*/
-/*N*/ // Header
-/*N*/
-/*N*/ ScMultipleWriteHeader aHdr( rStream );
-/*N*/ rStream << nAreaCount;
-/*N*/
-/*N*/ // Links speichern
-/*N*/
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ {
-/*N*/ ::binfilter::SvBaseLink* pBase = *rLinks[i];
-/*N*/ if (pBase->ISA(ScAreaLink))
-/*N*/ {
-/*?*/ ScAreaLink* pLink = (ScAreaLink*)pBase;
-/*?*/
-/*?*/ aHdr.StartEntry();
-/*?*/
-/*?*/ rStream.WriteByteString( pLink->GetFile(), rStream.GetStreamCharSet() );
-/*?*/ rStream.WriteByteString( pLink->GetFilter(), rStream.GetStreamCharSet() );
-/*?*/ rStream.WriteByteString( pLink->GetSource(), rStream.GetStreamCharSet() );
-/*?*/ rStream << pLink->GetDestArea(); // ScRange
-/*?*/ rStream.WriteByteString( pLink->GetOptions(), rStream.GetStreamCharSet() );
-/*?*/ // filter options starting from 336
-/*?*/
-/*?*/ aHdr.EndEntry();
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ void ScDocument::LoadAreaLinks(SvStream& rStream)
/*N*/ {
/*N*/ ScMultipleReadHeader aHdr( rStream );
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index f92fd1b..e51e401 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -413,19 +413,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
OSL_FAIL("The Modificator should exist");
/*N*/ }
-/*N*/ BOOL ScDocShell::SaveXML( SfxMedium* pInMedium, SvStorage* pStor )
-/*N*/ {
-/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::SaveXML" );
-/*N*/
-/*N*/ ScXMLImportWrapper aImport( aDocument, pInMedium, pStor );
-/*N*/ sal_Bool bRet(sal_False);
-/*N*/ if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
-/*N*/ bRet = aImport.Export(sal_False);
-/*N*/ else
-/*N*/ bRet = aImport.Export(sal_True);
-/*N*/ return bRet;
-/*N*/ }
-
/*N*/ BOOL ScDocShell::Load( SvStorage* pStor )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx
index 8ebdbfc..e53c291 100644
--- a/binfilter/bf_sc/source/ui/inc/docsh.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx
@@ -121,7 +121,6 @@ class ScDocShell: public SfxObjectShell, public SfxInPlaceObject, public SfxList
void ResetDrawObjectShell();
BOOL LoadCalc( SvStorage* pStor );
- BOOL SaveXML( SfxMedium* pMedium, SvStorage* pStor );
void UpdateAllRowHeights();
void RemoveUnknownObjects();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 23959c3..9b2e2a9 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -1004,10 +1004,6 @@ namespace binfilter {
/*N*/ }
/*N*/ long nId=pObjId->GetObjId();
/*N*/
- #if OSL_DEBUG_LEVEL > 0
-/*N*/ CHART_TRACE2( "ChartModel::StoreObjectsAttributes Id=%s %s", GetCHOBJIDName( nId ), bReplaceAll? "ReplaceAll" : "Merge" );
- #endif
-/*N*/
/*N*/ switch(nId)
/*N*/ {
/*N*/
@@ -1120,9 +1116,6 @@ namespace binfilter {
/*N*/ ZAxisTitle()=rTitle;
/*N*/ break;
/*N*/ default:
- #if OSL_DEBUG_LEVEL > 0
-/*?*/ CHART_TRACE2( "SetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
- #endif
/*N*/ break;
/*N*/ }
/*N*/ }
@@ -1142,9 +1135,6 @@ namespace binfilter {
/*N*/ case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
/*N*/ return ZAxisTitle();
/*N*/ default:
- #if OSL_DEBUG_LEVEL > 0
-/*?*/ CHART_TRACE2( "GetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
- #endif
/*?*/ return String();
/*N*/ }
/*N*/ }
@@ -1173,9 +1163,6 @@ namespace binfilter {
/*N*/ SetLegendHasBeenMoved(bMoved);
/*N*/ break;
/*N*/ default:
- #if OSL_DEBUG_LEVEL > 0
-/*?*/ CHART_TRACE2( "SetHasBeenMoved: Object not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
- #endif
/*N*/ break;
/*N*/ }
/*N*/ }
@@ -1184,11 +1171,6 @@ namespace binfilter {
/*N*/ {
/*N*/ //ToDo: Das hier könnte man auch schöner machen (kein DEEP!)
/*N*/ SdrObject* pObj=(GetObjWithId ((USHORT)nId,*GetPage(0),0,IM_DEEPWITHGROUPS));
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // there is no DBG_ASSERT2
-/*N*/ if( !pObj )
-/*N*/ OSL_TRACE( "GetObjWithId: Object not found (id=%ld => %s)", nId, GetCHOBJIDName( nId ) );
-/*N*/ #endif
/*N*/ return pObj;
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx
index 49d5705..ff0aaa1 100644
--- a/binfilter/bf_sch/source/core/sch_objid.cxx
+++ b/binfilter/bf_sch/source/core/sch_objid.cxx
@@ -139,78 +139,6 @@ namespace binfilter {
/*N*/
/*N*/ rIn >> nObjId;
/*N*/ }
-
-/*N*/ #if OSL_DEBUG_LEVEL > 0
-
-// this function is for debugging only
-// therefore it is ok to use char* instead of UniString
-/*N*/ const char* GetCHOBJIDName( const long id )
-/*N*/ {
-/*N*/ switch( id )
-/*N*/ {
-/*?*/ case CHOBJID_ANY: return "CHOBJID_ANY";
-/*?*/ case CHOBJID_TEXT: return "CHOBJID_TEXT";
-/*?*/ case CHOBJID_AREA: return "CHOBJID_AREA";
-/*?*/ case CHOBJID_LINE: return "CHOBJID_LINE";
-/*?*/ case CHOBJID_DIAGRAM_AREA: return "CHOBJID_DIAGRAM_AREA";
-/*?*/ case CHOBJID_TITLE_MAIN: return "CHOBJID_TITLE_MAIN";
-/*?*/ case CHOBJID_TITLE_SUB: return "CHOBJID_TITLE_SUB";
-/*?*/ case CHOBJID_DIAGRAM: return "CHOBJID_DIAGRAM";
-/*?*/ case CHOBJID_DIAGRAM_WALL: return "CHOBJID_DIAGRAM_WALL";
-/*?*/ case CHOBJID_DIAGRAM_FLOOR: return "CHOBJID_DIAGRAM_FLOOR";
-/*?*/ case CHOBJID_DIAGRAM_TITLE_X_AXIS: return "CHOBJID_DIAGRAM_TITLE_X_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_TITLE_Y_AXIS: return "CHOBJID_DIAGRAM_TITLE_Y_AXIS";
-/*N*/ case CHOBJID_DIAGRAM_TITLE_Z_AXIS: return "CHOBJID_DIAGRAM_TITLE_Z_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_X_AXIS: return "CHOBJID_DIAGRAM_X_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_Y_AXIS: return "CHOBJID_DIAGRAM_Y_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_Z_AXIS: return "CHOBJID_DIAGRAM_Z_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_A_AXIS: return "CHOBJID_DIAGRAM_A_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_B_AXIS: return "CHOBJID_DIAGRAM_B_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_C_AXIS: return "CHOBJID_DIAGRAM_C_AXIS";
-/*?*/ case CHOBJID_DIAGRAM_X_GRID_MAIN: return "CHOBJID_DIAGRAM_X_GRID_MAIN";
-/*?*/ case CHOBJID_DIAGRAM_Y_GRID_MAIN: return "CHOBJID_DIAGRAM_Y_GRID_MAIN";
-/*?*/ case CHOBJID_DIAGRAM_Z_GRID_MAIN: return "CHOBJID_DIAGRAM_Z_GRID_MAIN";
-/*?*/ case CHOBJID_DIAGRAM_Y_GRID_HELP: return "CHOBJID_DIAGRAM_Y_GRID_HELP";
-/*?*/ case CHOBJID_DIAGRAM_Z_GRID_HELP: return "CHOBJID_DIAGRAM_Z_GRID_HELP";
-/*?*/ case CHOBJID_DIAGRAM_ROWGROUP: return "CHOBJID_DIAGRAM_ROWGROUP";
-/*?*/ case CHOBJID_DIAGRAM_ROWS: return "CHOBJID_DIAGRAM_ROWS";
-/*?*/ case CHOBJID_DIAGRAM_ROWSLINE: return "CHOBJID_DIAGRAM_ROWSLINE";
-/*?*/ case CHOBJID_DIAGRAM_DATA: return "CHOBJID_DIAGRAM_DATA";
-/*?*/ case CHOBJID_DIAGRAM_DESCRGROUP: return "CHOBJID_DIAGRAM_DESCRGROUP";
-/*?*/ case CHOBJID_DIAGRAM_DESCR_ROW: return "CHOBJID_DIAGRAM_DESCR_ROW";
-/*?*/ case CHOBJID_DIAGRAM_DESCR_COL: return "CHOBJID_DIAGRAM_DESCR_COL";
-/*?*/ case CHOBJID_DIAGRAM_DESCR_SYMBOL: return "CHOBJID_DIAGRAM_DESCR_SYMBOL";
-/*?*/ case CHOBJID_LEGEND: return "CHOBJID_LEGEND";
-/*?*/ case CHOBJID_LEGEND_BACK: return "CHOBJID_LEGEND_BACK";
-/*?*/ case CHOBJID_LEGEND_SYMBOL_ROW: return "CHOBJID_LEGEND_SYMBOL_ROW";
-/*?*/ case CHOBJID_LEGEND_SYMBOL_COL: return "CHOBJID_LEGEND_SYMBOL_COL";
-/*?*/ case CHOBJID_DIAGRAM_Z_AXIS_GROUP: return "CHOBJID_DIAGRAM_Z_AXIS_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_NET: return "CHOBJID_DIAGRAM_NET";
-/*?*/ case CHOBJID_DIAGRAM_AVERAGEVALUE: return "CHOBJID_DIAGRAM_AVERAGEVALUE";
-/*?*/ case CHOBJID_DIAGRAM_ERROR: return "CHOBJID_DIAGRAM_ERROR";
-/*?*/ case CHOBJID_DIAGRAM_REGRESSION: return "CHOBJID_DIAGRAM_REGRESSION";
-/*?*/ case CHOBJID_DIAGRAM_STACKEDGROUP: return "CHOBJID_DIAGRAM_STACKEDGROUP";
-/*?*/ case CHOBJID_DIAGRAM_STATISTICS_GROUP: return "CHOBJID_DIAGRAM_STATISTICS_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_X_GRID_MAIN_GROUP: return "CHOBJID_DIAGRAM_X_GRID_MAIN_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_Y_GRID_MAIN_GROUP: return "CHOBJID_DIAGRAM_Y_GRID_MAIN_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_Z_GRID_MAIN_GROUP: return "CHOBJID_DIAGRAM_Z_GRID_MAIN_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_X_GRID_HELP_GROUP: return "CHOBJID_DIAGRAM_X_GRID_HELP_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP: return "CHOBJID_DIAGRAM_Y_GRID_HELP_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP: return "CHOBJID_DIAGRAM_Z_GRID_HELP_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_SPECIAL_GROUP: return "CHOBJID_DIAGRAM_SPECIAL_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_STOCKLINE_GROUP: return "CHOBJID_DIAGRAM_STOCKLINE_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_STOCKLOSS_GROUP: return "CHOBJID_DIAGRAM_STOCKLOSS_GROUP";
-/*?*/ case CHOBJID_DIAGRAM_STOCKPLUS_GROUP: return "CHOBJID_DIAGRAM_STOCKPLUS_GROUP";
-/*?*/
-/*?*/ default:
-/*?*/ return "unknown Id";
-/*N*/ }
-/*N*/ }
-
-/*N*/ #endif // OSL_DEBUG_LEVEL
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index f626a43..9bfa180 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -813,12 +813,6 @@ using namespace ::com::sun::star::util;
/*?*/ }
-/*?*/ Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
-/*?*/ {
-/*?*/ return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
-/*?*/ }
-
-
/*?*/ void SwCrsrShell::UnSetVisCrsr()
/*?*/ {
/*?*/ pVisCrsr->Hide();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index 1381dad..b5d30e7 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -719,24 +719,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ }
/*N*/ }
/*N*/ }
-
-/*
- * SwDoc:
- * Reading and writing of the layout cache.
- */
-
-/*N*/ void SwDoc::ReadLayoutCache( SvStream& rStream )
-/*N*/ {
-/*N*/ if( !pLayoutCache )
-/*N*/ pLayoutCache = new SwLayoutCache();
-/*N*/ if( !pLayoutCache->IsLocked() )
-/*N*/ {
-/*N*/ pLayoutCache->GetLockCount() |= 0x8000;
-/*N*/ pLayoutCache->Read( rStream );
-/*N*/ pLayoutCache->GetLockCount() &= 0x7fff;
-/*N*/ }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/w4w/makefile.mk b/binfilter/bf_sw/source/filter/w4w/makefile.mk
index cc3f259..1932a49 100644
--- a/binfilter/bf_sw/source/filter/w4w/makefile.mk
+++ b/binfilter/bf_sw/source/filter/w4w/makefile.mk
@@ -47,7 +47,6 @@ CDEFS=$(CDEFS) -Dmydebug
# --- Files --------------------------------------------------------
CXXFILES = \
- sw_w4watr.cxx \
sw_w4wgraf.cxx \
sw_w4wpar1.cxx \
sw_w4wpar2.cxx \
@@ -57,7 +56,6 @@ CXXFILES = \
SLOFILES = \
- $(SLO)$/sw_w4watr.obj \
$(SLO)$/sw_w4wgraf.obj \
$(SLO)$/sw_w4wpar1.obj \
$(SLO)$/sw_w4wpar2.obj \
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
deleted file mode 100644
index 6e3bc04..0000000
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-/*
- * Dieses File enthaelt alle Ausgabe-Funktionen des W4W-Writers;
- * fuer alle Nodes, Attribute, Formate und Chars.
- */
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <hintids.hxx>
-
-#include <bf_svtools/whiter.hxx>
-#include <bf_svx/hyznitem.hxx>
-#include <bf_svx/langitem.hxx>
-#include <bf_svx/orphitem.hxx>
-#include <bf_svx/tstpitem.hxx>
-#include <bf_svx/spltitem.hxx>
-#include <bf_svx/widwitem.hxx>
-#include <bf_svx/adjitem.hxx>
-#include <bf_svx/cmapitem.hxx>
-#include <bf_svx/lspcitem.hxx>
-#include <bf_svx/kernitem.hxx>
-#include <bf_svx/wghtitem.hxx>
-#include <bf_svx/udlnitem.hxx>
-#include <bf_svx/escpitem.hxx>
-#include <bf_svx/crsditem.hxx>
-#include <bf_svx/colritem.hxx>
-#include <bf_svx/brkitem.hxx>
-#include <bf_svx/postitem.hxx>
-#include <bf_svx/shdditem.hxx>
-#include <bf_svx/ulspitem.hxx>
-#include <bf_svx/lrspitem.hxx>
-#include <bf_svx/fontitem.hxx>
-#include <bf_svx/fhgtitem.hxx>
-
-
-#include <fmtftn.hxx>
-#include <txtftn.hxx>
-#include <fmtpdsc.hxx>
-#include <fmthdft.hxx>
-#include <fmtcntnt.hxx>
-#include <fmtfsize.hxx>
-#include <fmtfld.hxx>
-#include <frmatr.hxx>
-#include <charatr.hxx>
-#include <ftninfo.hxx>
-#include <ndtxt.hxx>
-#include <doc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <fldbas.hxx> // fuer SwField ...
-#include <ndgrf.hxx>
-#include <grfatr.hxx>
-#include <fmtcol.hxx>
-#include <bookmrk.hxx> // fuer SwBookmark ...
-#include <pagedesc.hxx> // fuer SwPageDesc...
-#include <pageiter.hxx>
-#include <wrtw4w.hxx>
-namespace binfilter {
-
-
-/*
- * um nicht immer wieder nach einem Update festzustellen, das irgendwelche
- * Hint-Ids dazugekommen sind, wird hier definiert, die Groesse der Tabelle
- * definiert und mit der akt. verglichen. Bei unterschieden wird der
- * Compiler schon meckern.
- *
- * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
- * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
- */
-
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MINGW32__) && !defined(OS2)
-
-#define ATTRFNTAB_SIZE 130
-#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
-#error "Attribut-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-
-#ifdef FORMAT_TABELLE
-// da sie nicht benutzt wird!
-#define FORMATTAB_SIZE 7
-#if FORMATTAB_SIZE != RES_FMT_END - RES_FMT_BEGIN
-#error "Format-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-#endif
-
-#define NODETAB_SIZE 3
-#if NODETAB_SIZE != RES_NODE_END - RES_NODE_BEGIN
-#error "Node-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-
-#endif
-
-
-
-//-----------------------------------------------------------------------
-
-// einige Forward Deklarationen
-
-#define OUTRECORD(rStrm,pStr) rStrm << sW4W_RECBEGIN << pStr << cW4W_RED
-
-inline int HI_BYTE( USHORT n ) { return (int)( ( n >> 8 ) & 0xff ); }
-inline int LO_BYTE( USHORT n ) { return (int)( n & 0xff ); }
-
-
-/* Ausgabe der Nodes */
-
-/*
- * Ausgabe der Texte-Attribute:
- * Die Text-Attribute sind in einem VarArray nach ihren Start-Positionen
- * sortiert. Fuer den W4W-Writer ist aber auch das Ende von Bedeutung.
- * Darum die Idee, sobald im SwpHints-Array ein Attribut mit der Start-
- * Position gefunden wurde, in einem Sortierten-Array die Endposition
- * zu speichern. Sobald der Writer die Position erreicht hat, wird die
- * schliessende Klammer ausgegeben und die Position aus dem Sort.Array
- * geloescht.
- */
-
-struct W4WSttEndPos
-{
- USHORT nFontSize, nFontId;
- const SwTxtAttr* pTxtAttr;
- W4WSttEndPos( const SwTxtAttr* pTxtAt, USHORT nFSize, USHORT nFId );
- W4WSttEndPos( const W4WSttEndPos & rSEPos );
- BOOL operator<( const W4WSttEndPos & rSEPos );
-};
-
-W4WSttEndPos::W4WSttEndPos( const SwTxtAttr* pTxtAt, USHORT nFSize, USHORT nFId )
- : nFontSize(nFSize)
- , nFontId( nFId )
- , pTxtAttr(pTxtAt)
-{}
-
-W4WSttEndPos::W4WSttEndPos( const W4WSttEndPos & rSEPos )
- : nFontSize( rSEPos.nFontSize )
- , nFontId( rSEPos.nFontId )
- , pTxtAttr( rSEPos.pTxtAttr)
-{}
-
-BOOL W4WSttEndPos::operator<( const W4WSttEndPos & rSEPos )
-{
- USHORT nEnd1, nEnd2;
- if( ( nEnd1 = *pTxtAttr->GetEnd() ) < ( nEnd2 = *rSEPos.pTxtAttr->GetEnd() ) )
- return TRUE;
- if( nEnd1 == nEnd2 )
- return *pTxtAttr->GetStart() > *rSEPos.pTxtAttr->GetStart();
- return FALSE;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index d0f66e0..9291879 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -1284,8 +1284,6 @@ public:
private: // CLOOK-Impl-Methoden
void ImplLoadDocOptions( SvStream& rStream );
void ImplLoadViewOptions( SvStream& rStream );
- void ImplSaveDocOptions( SvStream& rStream ) const;
- void ImplSaveViewOptions( SvStream& rStream ) const;
void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen?
void ImplDeleteOptions();
@@ -1299,7 +1297,6 @@ private: // CLOOK-Impl-Methoden
void LoadDdeLinks(SvStream& rStream);
void LoadAreaLinks(SvStream& rStream);
- void SaveAreaLinks(SvStream& rStream) const;
void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
const ScRange& r, short nDx, short nDy, short nDz );
diff --git a/binfilter/inc/bf_sch/objid.hxx b/binfilter/inc/bf_sch/objid.hxx
index 7dcda77..68c98e1 100644
--- a/binfilter/inc/bf_sch/objid.hxx
+++ b/binfilter/inc/bf_sch/objid.hxx
@@ -70,11 +70,6 @@ extern SdrObject* GetObjWithId(UINT16 nObjId, const SdrObjList& rObjList,
ULONG* pIndex = NULL,
SdrIterMode eMode = IM_FLAT);
-//Die hier folgenden Funktionen dienen AUSSCHLIESSLICH zu DEBUG-Zwecken
-#if OSL_DEBUG_LEVEL > 0
-extern const char *GetCHOBJIDName(const long id);
-#endif
-
} //namespace binfilter
#endif // _SCH_OBJID_HXX
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index c849550..2cffbe6 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -434,8 +434,6 @@ public:
// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
CRSR_INLINE const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
- // erfrage die Document - Layout - Position vom akt. Crsr
- CRSR_INLINE Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
CRSR_INLINE bool IsCrsrPtAtEnd() const;
CRSR_INLINE const SwPaM* GetTblCrs() const;
@@ -612,11 +610,6 @@ inline bool SwCrsrShell::IsCrsrPtAtEnd() const
return pCurCrsr->End() == pCurCrsr->GetPoint();
}
-inline Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
-{
- return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
-}
-
inline const SwPaM* SwCrsrShell::GetTblCrs() const
{
return pTblCrsr;
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index a1af1f7..d6fc723 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1549,7 +1549,6 @@ public:
else n8Dummy2 &= ~DUMMY_ADD_FLY_OFFSETS;
}
- void ReadLayoutCache( SvStream& rStream );
SwLayoutCache* GetLayoutCache() const { return pLayoutCache; }
void SetULongDummy1( sal_uInt32 n ) { n32Dummy1 = n; }
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
new file mode 100644
index 0000000..c24aedc
--- /dev/null
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BF_STRING_HXX
+#define _BF_STRING_HXX
+
+#include <tools/string.hxx>
+
+namespace binfilter
+{
+ ByteString ByteString_CreateFromInt32(sal_Int32 n, sal_Int16 nRadix = 10);
+}
+
+#endif // _BF_STRING_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a01040959cd963a855bf49d74adc697fa37d2139
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 31 15:50:57 2011 +0100
ditch unused code
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index a15ab3f..a948001 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -199,14 +199,6 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
if( pNew )
break;
}
-#ifdef DBG_UTIL
- if( !pNew )
- {
- ByteString aMsg( "SBX: Keine Factory fuer SBX-ID " );
- aMsg += ByteString::CreateFromInt32(nSbxId);
- DbgError( aMsg.GetBuffer() );
- }
-#endif
return pNew;
}
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index 7b6ff97..7b13008 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -95,28 +95,6 @@ namespace binfilter {
#ifdef DBG_UTIL
/*N*/ void ScAttrArray::TestData() const
/*N*/ {
-/*N*/ USHORT nErr = 0;
-/*N*/ if (pData)
-/*N*/ {
-/*N*/ USHORT nPos=0;
-/*N*/ for (nPos=0; nPos<nCount; nPos++)
-/*N*/ {
-/*N*/ if (nPos)
-/*N*/ if (pData[nPos].pPattern == pData[nPos-1].pPattern || pData[nPos].nRow <= pData[nPos-1].nRow)
-/*N*/ ++nErr;
-/*N*/ if (pData[nPos].pPattern->Which() != ATTR_PATTERN)
-/*N*/ ++nErr;
-/*N*/ }
-/*N*/ if ( nPos && pData[nPos-1].nRow != MAXROW )
-/*N*/ ++nErr;
-/*N*/ }
-/*N*/ if (nErr)
-/*N*/ {
-/*?*/ ByteString aMsg = ByteString::CreateFromInt32(nErr);
-/*?*/ aMsg += " errors in attribute array, column ";
-/*?*/ aMsg += ByteString::CreateFromInt32(nCol);
-/*?*/ OSL_FAIL( aMsg.GetBuffer() );
-/*N*/ }
/*N*/ }
#endif
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 6f0e48e..a17e536 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -477,27 +477,6 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ if ( !nEdges )
/*N*/ nEdges = 1; // mittendrin
/*N*/ }
-/*N*/ #ifdef DBG_UTIL
-/*N*/ else
-/*N*/ {
-/*?*/ String aTmp;
-/*?*/ ByteString aMsg( "broken Matrix, Pos: " );
-/*?*/ aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
-/*?*/ aMsg += ByteString( aTmp, RTL_TEXTENCODING_ASCII_US );
-/*?*/ aMsg += ", MatOrg: ";
-/*?*/ aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
-/*?*/ aMsg += ByteString( aTmp, RTL_TEXTENCODING_ASCII_US );
-/*?*/ aMsg += ", MatCols: ";
-/*?*/ aMsg += ByteString::CreateFromInt32( nC );
-/*?*/ aMsg += ", MatRows: ";
-/*?*/ aMsg += ByteString::CreateFromInt32( nR );
-/*?*/ aMsg += ", DiffCols: ";
-/*?*/ aMsg += ByteString::CreateFromInt32( dC );
-/*?*/ aMsg += ", DiffRows: ";
-/*?*/ aMsg += ByteString::CreateFromInt32( dR );
-/*?*/ DBG_ERRORFILE( aMsg.GetBuffer() );
-/*N*/ }
-/*N*/ #endif
/*N*/ return nEdges;
/*N*/ break;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 05dacdc..364c804 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -551,14 +551,6 @@ void SfxFilterMatcher::AddContainer( SfxFilterContainer* pC )
#define CHECKERROR() \
if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
{ \
- ByteString aText = "Fehler in FilterDetection: Returnwert ";\
- aText += ByteString::CreateFromInt32(nErr); \
- if( pFilter ) \
- { \
- aText += ' '; \
- aText += ByteString(U2S(pFilter->GetFilterName())); \
- } \
- OSL_FAIL( aText.GetBuffer() ); \
nErr = ERRCODE_ABORT; \
}
diff --git a/binfilter/bf_so3/source/inplace/client.cxx b/binfilter/bf_so3/source/inplace/client.cxx
index 72d4871..903b8bc 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -243,36 +243,13 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvEmbeddedClient,SvEmbeddedClientFactory,SvObject,
return NULL;
}
-void SvEmbeddedClient::TestMemberObjRef( BOOL bFree )
+void SvEmbeddedClient::TestMemberObjRef( BOOL )
{
- (void)bFree;
-
-#ifdef DBG_UTIL
- if( GetEmbedObj() )
- {
- ByteString aTest = "\t\tGetEmbedObj() == ";
- aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetEmbedObj() ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-#endif
}
#ifdef TEST_INVARIANT
-void SvEmbeddedClient::TestMemberInvariant( BOOL bPrint )
+void SvEmbeddedClient::TestMemberInvariant( BOOL )
{
-#ifdef DBG_UTIL
- if( bPrint )
- {
- if( HasViewData() )
- {
- ByteString aTest( "\t\tSvClientData == " );
- aTest.Append( ByteString::CreateFromInt32( (ULONG)GetClientData() ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
- }
-#else
- (void)bPrint;
-#endif
}
#endif
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index e7d656e..ea35724 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -200,14 +200,6 @@ SO2_IMPL_CLASS2_DLL(SvEmbeddedObject,SvFactory,SvPersist,SvPseudoObject,
void SvEmbeddedObject::TestMemberObjRef( BOOL /*bFree*/ )
{
-#ifdef DBG_UTIL
- if( GetClient() )
- {
- ByteString aTest = "\t\tGetClient() == ";
- aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetClient() ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-#endif
}
#ifdef TEST_INVARIANT
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index fc3410d..c1905f6 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -99,14 +99,6 @@ SvInPlaceClient::~SvInPlaceClient()
void SvInPlaceClient::TestMemberObjRef( BOOL bFree )
{
(void)bFree;
-#ifdef DBG_UTIL
- if( GetIPObj() )
- {
- ByteString aTest = "\t\tGetIPObj() == ";
- aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPObj() ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-#endif
}
//=========================================================================
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 6ac70c7..db5979a 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -59,33 +59,12 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvInPlaceObject,SvInPlaceObjectFactory,SvEmbeddedOb
void SvInPlaceObject::TestMemberObjRef( BOOL bFree )
{
(void)bFree;
-
-#ifdef DBG_UTIL
- if( GetIPClient() )
- {
- ByteString aTest = "\t\tGetIPClient() == ";
- aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPClient() ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-#endif
}
#ifdef TEST_INVARIANT
void SvInPlaceObject::TestMemberInvariant( BOOL bPrint )
{
-#ifdef DBG_UTIL
- if( bPrint )
- {
- if( pIPEnv )
- {
- ByteString aTest( "\t\tSvInPlaceEnvironment == " );
- aTest.Append( ByteString::CreateFromInt32( (ULONG)pIPEnv ) );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
- }
-#else
(void)bPrint;
-#endif
}
#endif
diff --git a/binfilter/bf_so3/source/inplace/protocol.cxx b/binfilter/bf_so3/source/inplace/protocol.cxx
index dec1faa..eba79c6 100644
--- a/binfilter/bf_so3/source/inplace/protocol.cxx
+++ b/binfilter/bf_so3/source/inplace/protocol.cxx
@@ -39,17 +39,6 @@
namespace binfilter {
-#define DBG_PROTLOG(FuncName,bVal) \
-{ \
- ByteString aTS( ByteString::CreateFromInt32( (ULONG)this ) ); \
- aTS += "-Obj Edit Prot --- "; \
- aTS += FuncName; \
- aTS += "( "; \
- aTS += bVal ? "TRUE" : "FALSE"; \
- aTS += " )"; \
- OSL_TRACE( "%s", aTS.GetBuffer() ); \
-}
-
#define DBG_PROTREC(FuncName) \
OSL_TRACE( FuncName )
@@ -742,7 +731,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
"connect assert failed" );
DBG_ASSERT( aClient.Is(), "connect assert failed" );
bCliConnect = TRUE;
- DBG_PROTLOG( "Cli - Connected", bConnectP )
aClient->Connected( TRUE );
}
@@ -756,7 +744,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
|| (!bConnect && !bConnectP && !bLastActionConnect && bSvrConnect),
"connect assert failed" );
bSvrConnect = bConnect;
- DBG_PROTLOG( "Obj - Connected", bConnectP )
aObj->Connect( bConnect );
}
@@ -769,7 +756,6 @@ void ImplSvEditObjectProtocol::Connected( BOOL bConnectP )
"connect assert failed" );
DBG_ASSERT( aClient.Is(), "connect assert failed" );
bCliConnect = FALSE;
- DBG_PROTLOG( "Cli - Connected", bConnectP )
aClient->Connected( FALSE );
}
@@ -820,7 +806,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
DBG_ASSERT( bOpen && bOpenP && bLastActionOpen && !bCliOpen,
"open assert failed" );
bCliOpen = TRUE;
- DBG_PROTLOG( "Cli - Opened", bOpenP )
aClient->Opened( TRUE );
}
@@ -834,7 +819,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
|| (!bOpen && !bOpenP && !bLastActionOpen && bSvrOpen),
"open assert failed" );
bSvrOpen = bOpen;
- DBG_PROTLOG( "Svr - Opened", bOpenP )
aObj->Open( bOpen );
}
@@ -847,7 +831,6 @@ void ImplSvEditObjectProtocol::Opened( BOOL bOpenP )
"open assert failed" );
DBG_ASSERT( aClient.Is(), "open assert failed" );
bCliOpen = FALSE;
- DBG_PROTLOG( "Cli - Opened", bOpenP )
aClient->Opened( FALSE );
}
CLASS_INVARIANT
@@ -889,7 +872,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
DBG_ASSERT( bEmbed && bEmbedP && bLastActionEmbed && !bCliEmbed,
"embed assert failed" );
bCliEmbed = TRUE;
- DBG_PROTLOG( "Cli - Embedded", bEmbedP )
aClient->Embedded( TRUE );
}
@@ -903,7 +885,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
|| (!bEmbed && !bEmbedP && !bLastActionEmbed && bSvrEmbed),
"embed assert failed" );
bSvrEmbed = bEmbed;
- DBG_PROTLOG( "Svr - Embedded", bEmbedP )
aObj->Embed( bEmbed );
if( bEmbed && aObj->GetDocumentName().Len() )
aObj->DocumentNameChanged( aObj->GetDocumentName() );
@@ -917,7 +898,6 @@ void ImplSvEditObjectProtocol::Embedded( BOOL bEmbedP )
DBG_ASSERT( !bEmbed && !bEmbedP && !bLastActionEmbed && bCliEmbed,
"embed assert failed" );
bCliEmbed = FALSE;
- DBG_PROTLOG( "Cli - Embedded", bEmbedP )
aClient->Embedded( FALSE );
}
CLASS_INVARIANT
@@ -964,7 +944,6 @@ void ImplSvEditObjectProtocol::PlugIn
DBG_ASSERT( bPlugIn && bPlugInP && bLastActionPlugIn && !bCliPlugIn,
"PlugIn assert failed" );
bCliPlugIn = TRUE;
- DBG_PROTLOG( "Cli - PlugIn", bPlugInP )
aClient->PlugIn( TRUE );
}
@@ -978,7 +957,6 @@ void ImplSvEditObjectProtocol::PlugIn
|| (!bPlugIn && !bPlugInP && !bLastActionPlugIn && bSvrPlugIn),
"PlugIn assert failed" );
bSvrPlugIn = bPlugIn;
- DBG_PROTLOG( "Svr - PlugIn", bPlugInP )
aObj->PlugIn( bPlugIn );
if( bPlugIn && aObj->GetDocumentName().Len() )
aObj->DocumentNameChanged( aObj->GetDocumentName() );
@@ -992,7 +970,6 @@ void ImplSvEditObjectProtocol::PlugIn
DBG_ASSERT( !bPlugIn && !bPlugInP && !bLastActionPlugIn && bCliPlugIn,
"PlugIn assert failed" );
bCliPlugIn = FALSE;
- DBG_PROTLOG( "Cli - PlugIn", bPlugInP )
aClient->PlugIn( FALSE );
}
CLASS_INVARIANT
@@ -1037,7 +1014,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
"inplace assert failed" );
DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
bCliIPActive = TRUE;
- DBG_PROTLOG( "Cli - InPlaceActivate", bIPActiveP )
if( aIPClient->Owner() )
SvInPlaceClient::GetIPActiveClientList().Insert( aIPClient, LIST_APPEND );
aIPClient->InPlaceActivate( TRUE );
@@ -1054,7 +1030,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
"inplace assert failed" );
DBG_ASSERT( aIPObj.Is(), "inplace assert failed" );
bSvrIPActive = bIPActive;
- DBG_PROTLOG( "Svr - InPlaceActivate", bIPActiveP )
if( bIPActive )
{
aIPObj->InPlaceActivate( bIPActive );
@@ -1080,7 +1055,6 @@ void ImplSvEditObjectProtocol::InPlaceActivate( BOOL bIPActiveP )
"open assert failed" );
bCliIPActive = FALSE;
DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
- DBG_PROTLOG( "Cli - InPlaceActivate", bIPActiveP )
if( aIPClient->Owner() )
SvInPlaceClient::GetIPActiveClientList().Remove( aIPClient );
aIPClient->InPlaceActivate( FALSE );
@@ -1112,7 +1086,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
bLastActionUIActive = bUIActiveP;
if( bUIActiveP )
InPlaceActivate( bUIActiveP );
- DBG_PROTLOG( "UIActivate", bUIActiveP )
DBG_ASSERT( !bEmbed && !bPlugIn, "ui assert failed" );
bUIActive = bUIActiveP; // vor der Aktion den Status setzen
if( bLastActionUIActive && !bCliUIActive )
@@ -1154,7 +1127,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
if( bLastActionUIActive && !bCliUIActive )
{ // wer weis was DoInPlaceActivate getan hat
bCliUIActive = TRUE;
- DBG_PROTLOG( "Cli - UIActivate", bUIActiveP )
aIPClient->UIActivate( TRUE );
if( aIPObj.Is() && aIPObj->Owner() )
{ // Tools anordnen anstossen, aber nur wenn selbst
@@ -1174,7 +1146,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
"ui assert failed" );
DBG_ASSERT( aIPObj.Is(), "inplace assert failed" );
bSvrUIActive = bUIActive;
- DBG_PROTLOG( "Obj - UIActivate", bUIActiveP )
if( aIPClient->Owner() )
{
if( aIPClient->GetEnv()->GetDocWin() )
@@ -1194,7 +1165,6 @@ void ImplSvEditObjectProtocol::UIActivate( BOOL bUIActiveP )
"open assert failed" );
bCliUIActive = FALSE;
DBG_ASSERT( aIPClient.Is(), "inplace assert failed" );
- DBG_PROTLOG( "Cli - UIActivate", bUIActiveP )
aIPClient->UIActivate( FALSE );
}
diff --git a/binfilter/bf_so3/source/misc/iface.cxx b/binfilter/bf_so3/source/misc/iface.cxx
index 4344f23..5346541 100644
--- a/binfilter/bf_so3/source/misc/iface.cxx
+++ b/binfilter/bf_so3/source/misc/iface.cxx
@@ -79,20 +79,6 @@ void SvObject::TestMemberObjRef( BOOL /*bFree*/ )
#ifdef TEST_INVARIANT
void SvObject::TestMemberInvariant( BOOL /*bPrint*/ )
{
-#ifdef DBG_UTIL
- if( !Owner() && pClient )
- {
- ByteString aTest( "\t\tpClient == " );
- aTest += ByteString::CreateFromInt32( (ULONG)pClient );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
- if( Owner() && pService )
- {
- ByteString aTest( "\t\tpService == " );
- aTest += ByteString::CreateFromInt32( (ULONG)pService );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-#endif
}
#endif
@@ -123,16 +109,6 @@ SvObject::~SvObject()
*************************************************************************/
UINT32 SvObject::ReleaseRef()
{
-#ifdef DBG_UTIL
- if( GetRefCount() == nExtCount )
- {
- ByteString aStr( "Internal RefCount underflow: Count == " );
- aStr += ByteString::CreateFromInt32( GetRefCount() );
- aStr += ", ExtCount == ";
- aStr += ByteString::CreateFromInt32( nExtCount );
- OSL_FAIL( aStr.GetBuffer() );
- }
-#endif
return SotObject::ReleaseRef();
}
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index f4e0e65..f473e99 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -39,6 +39,7 @@
#include <sot/formats.hxx>
#include <tools/debug.hxx>
+#include <bf_tools/string.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/tempfile.hxx>
@@ -297,9 +298,9 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
if( pEle->GetObj() )
{
ByteString aTest( "\t\tpChildList[ " );
- aTest += ByteString::CreateFromInt32( i );
+ aTest += ByteString_CreateFromInt32( i );
aTest += " ] == ";
- aTest += ByteString::CreateFromInt32( (ULONG)pEle->GetObj() );
+ aTest += ByteString_CreateFromInt32( (ULONG)pEle->GetObj() );
OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
@@ -307,7 +308,7 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
if( aStorage.Is() )
{
ByteString aTest( "\t\taStorage == " );
- aTest += ByteString::CreateFromInt32( (ULONG)&aStorage );
+ aTest += ByteString_CreateFromInt32( (ULONG)&aStorage );
OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index 59ae721..200574f 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -36,20 +36,6 @@
namespace binfilter {
-
-////////////////////////////////////////
-
-/*N*/ SvStream& operator << (SvStream& rStream, const SmFace& rFont)
-/*N*/ {
-/*N*/ rStream.WriteByteString(ExportString(rFont.GetName()));
-/*N*/ rStream << (sal_uInt32)rFont.GetFamily();
-/*N*/ rStream << (sal_uInt32)GetSOStoreTextEncoding( rFont.GetCharSet() );
-/*N*/ rStream << (sal_uInt32)rFont.GetWeight();
-/*N*/ rStream << (sal_uInt32)rFont.GetItalic();
-/*N*/
-/*N*/ return rStream;
-/*N*/ }
-
/*N*/ SvStream& operator >> (SvStream& rStream, SmFace& rFont)
/*N*/ {
/*N*/ sal_uInt32 nData;
@@ -150,41 +136,6 @@ namespace binfilter {
#define PRE_TE "<?"
#define POST_TE ")>"
-
-ByteString ConvertUnknownCharacter(sal_Unicode ch)
-{
- ByteString aString( RTL_CONSTASCII_STRINGPARAM( PRE_TE TE_UCS2 ) );
- aString.Append( "(" );
- aString += ByteString::CreateFromInt32(ch);
- aString += POST_TE;
- return aString;
-}
-
-
-/*N*/ const ByteString ExportString( const String& rString )
-/*N*/ {
-/*N*/ ByteString aString;
-/*N*/
-/*N*/ rtl_TextEncoding nEnc = RTL_TEXTENCODING_MS_1252;
-/*N*/ for (xub_StrLen i = 0; i < rString.Len(); i++)
-/*N*/ {
-/*N*/ sal_Unicode ch = rString.GetChar(i);
-/*N*/ if ((ch != '\r') && (ch != '\n') && (ch != '\t'))
-/*N*/ {
-/*N*/ sal_Char cChar = ByteString::ConvertFromUnicode( ch, nEnc, FALSE );
-/*N*/ if (cChar == 0)
-/*?*/ aString += ConvertUnknownCharacter(ch);
-/*N*/ else
-/*N*/ aString += cChar;
-/*N*/ }
-/*N*/ else
-/*N*/ aString += (sal_Char) ch;
-/*N*/ }
-/*N*/
-/*N*/ aString.ConvertLineEnd(LINEEND_CRLF);
-/*N*/ return aString;
-/*N*/ }
-
#define TEXTENCODINGTAB_LEN 12
static const struct
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
index c61b8a4..7b8b752 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
@@ -1282,7 +1282,6 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
break;
default:
- OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() );
break;
}
}
diff --git a/binfilter/bf_svtools/source/items1/whassert.hxx b/binfilter/bf_svtools/source/items1/whassert.hxx
index 1942162..5514fdb 100644
--- a/binfilter/bf_svtools/source/items1/whassert.hxx
+++ b/binfilter/bf_svtools/source/items1/whassert.hxx
@@ -29,7 +29,7 @@
#define _SFX_WHASSERT_HXX
#include <tools/debug.hxx>
-#include <tools/string.hxx>
+#include <rtl/strbuf.hxx>
namespace binfilter
{
@@ -43,10 +43,10 @@ namespace binfilter
{ \
if ( !(bCondition) ) \
{ \
- ByteString aMsg( sMessage ); \
- aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: ")); \
- aMsg += ByteString::CreateFromInt32( nId ); \
- DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__); \
+ rtl::OStringBuffer aMsg( sMessage ); \
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: ")); \
+ aMsg.append(static_cast<sal_Int32>(nId)); \
+ DbgOut(aMsg.getStr(), DBG_OUT_ERROR, __FILE__, __LINE__); \
} \
} \
}
diff --git a/binfilter/bf_svtools/source/misc/makefile.mk b/binfilter/bf_svtools/source/misc/makefile.mk
index fc882f3..62ce32e 100644
--- a/binfilter/bf_svtools/source/misc/makefile.mk
+++ b/binfilter/bf_svtools/source/misc/makefile.mk
@@ -57,7 +57,8 @@ SLOFILES=\
$(SLO)$/svt_imap3.obj \
$(SLO)$/svt_ownlist.obj \
$(SLO)$/svt_vcldata.obj \
- $(SLO)$/svt_restrictedpaths.obj
+ $(SLO)$/svt_restrictedpaths.obj \
+ $(SLO)$/tl_tstring.obj
# --- Targets -------------------------------------------------------
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index b87bdc8..a8f08e3 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -57,6 +57,7 @@
#include <bf_svtools/syslocaleoptions.hxx>
#include "listener.hxx"
#include <bf_svtools/smplhint.hxx>
+#include <bf_tools/string.hxx>
#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
@@ -1803,7 +1804,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
{
aMsg.Insert( "SvNumberFormatter::ImpAdjustFormatCodeDefault: ", 0 );
aMsg += "\nXML locale data FormatElement formatindex: ";
- aMsg += ByteString::CreateFromInt32( pFormatArr[nElem].Index );
+ aMsg += ByteString_CreateFromInt32( pFormatArr[nElem].Index );
String aUMsg( aMsg, RTL_TEXTENCODING_ASCII_US);
LocaleDataWrapper::outputCheckMessage(
xLocaleData->appendLocaleInfo( aUMsg));
@@ -3160,14 +3161,14 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr )
if ( nPos >= 0 && nNeg >= 0 && nPos != nNeg )
{
ByteString aStr( "positions of currency symbols differ\nLanguage: " );
- aStr += ByteString::CreateFromInt32( rCurr.GetLanguage() );
+ aStr += ByteString_CreateFromInt32( rCurr.GetLanguage() );
aStr += " <";
aStr += ByteString( rCurr.GetSymbol(), RTL_TEXTENCODING_UTF8 );
aStr += "> positive: ";
- aStr += ByteString::CreateFromInt32( rCurr.GetPositiveFormat() );
+ aStr += ByteString_CreateFromInt32( rCurr.GetPositiveFormat() );
aStr += ( nPos ? " (postfix)" : " (prefix)" );
aStr += ", negative: ";
- aStr += ByteString::CreateFromInt32( rCurr.GetNegativeFormat() );
+ aStr += ByteString_CreateFromInt32( rCurr.GetNegativeFormat() );
aStr += ( nNeg ? " (postfix)" : " (prefix)" );
}
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index 366862b..759cb49 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -68,8 +68,8 @@
#include "writingmodeitem.hxx"
#include <tools/bigint.hxx>
-
#include <tools/stream.hxx>
+#include <bf_tools/string.hxx>
#include <xtxasit.hxx>
#include <xfillit0.hxx>
@@ -380,9 +380,9 @@ void SdrItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEn
ByteString aStr("PoolDefaultItem not set: ");
aStr += "Num=";
- aStr += ByteString::CreateFromInt32( nNum );
+ aStr += ByteString_CreateFromInt32( nNum );
aStr += "Which=";
- aStr += ByteString::CreateFromInt32( nNum + 1000 );
+ aStr += ByteString_CreateFromInt32( nNum + 1000 );
OSL_FAIL(aStr.GetBuffer());
}
@@ -391,9 +391,9 @@ void SdrItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEn
ByteString aStr("PoolDefaultItem has wrong WhichId: ");
aStr += "Num=";
- aStr += ByteString::CreateFromInt32( nNum );
+ aStr += ByteString_CreateFromInt32( nNum );
aStr += " Which=";
- aStr += ByteString::CreateFromInt32( pItem->Which() );
+ aStr += ByteString_CreateFromInt32( pItem->Which() );
OSL_FAIL(aStr.GetBuffer());
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
index c716eaf..ad55c81 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <tools/debug.hxx>
-
+#include <bf_tools/string.hxx>
#include "svdio.hxx"
#include "svdobj.hxx"
#include <osl/endian.h>
@@ -226,14 +226,14 @@ namespace binfilter {
/*N*/
/*N*/ if(nSubRecReadCount != -1)
/*N*/ {
-/*N*/ rStr += ByteString::CreateFromInt32( nSubRecReadCount );
+/*N*/ rStr += ByteString_CreateFromInt32( nSubRecReadCount );
/*N*/ rStr += " von ";
-/*N*/ rStr += ByteString::CreateFromInt32( nSubRecCount );
+/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
/*N*/ rStr += " Records gelesen)";
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ rStr += ByteString::CreateFromInt32( nSubRecCount );
+/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
/*N*/ rStr += " Records)";
/*N*/ }
/*N*/ }
@@ -301,7 +301,7 @@ namespace binfilter {
/*?*/ aStr += "1 Byte";
/*?*/ else
/*?*/ {
-/*?*/ aStr += ByteString::CreateFromInt32( nToMuch );
+/*?*/ aStr += ByteString_CreateFromInt32( nToMuch );
/*?*/ aStr += " Bytes";
/*?*/ }
/*?*/
@@ -337,7 +337,7 @@ namespace binfilter {
/*?*/ else
/*?*/ {
/*?*/ aStr += "n ";
-/*?*/ aStr += ByteString::CreateFromInt32( nToMuch );
+/*?*/ aStr += ByteString_CreateFromInt32( nToMuch );
/*?*/ aStr += " Bytes";
/*?*/ }
/*?*/
@@ -539,7 +539,7 @@ namespace binfilter {
/*?*/ else
/*?*/ {
/*?*/ aErrMsg += "n ";
-/*?*/ aErrMsg += ByteString::CreateFromInt32( nToMuch );
+/*?*/ aErrMsg += ByteString_CreateFromInt32( nToMuch );
/*?*/ aErrMsg += " Bytes";
/*?*/ }
/*?*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 25fd575..9d6ef44 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -73,6 +73,7 @@
#include <bf_so3/persist.hxx>
#include <bf_svtools/zforlist.hxx>
+#include <bf_tools/string.hxx>
#include <tools/tenccvt.hxx>
#include <vcl/svapp.hxx>
#include <osl/endian.h>
@@ -1406,7 +1407,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ #ifdef DBG_UTIL
/*?*/ ByteString aMsg("Das Format dieser Datei ist noch von April '95 (Version ");
-/*?*/ aMsg += ByteString::CreateFromInt32( rHead.GetVersion() );
+/*?*/ aMsg += ByteString_CreateFromInt32( rHead.GetVersion() );
/*?*/ aMsg += "). Mit dieser Programmversion kann das nicht mehr gelesen werden";
/*?*/
/*?*/ OSL_FAIL(aMsg.GetBuffer());
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index 244ce52..fe6d26c 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -46,14 +46,9 @@
#include "svditer.hxx"
#include "svdpagv.hxx"
#include "polysc3d.hxx"
-
-#ifndef SVX_LIGHT
#include "fmdpage.hxx"
-#else
-#endif
-
-
#include "xoutx.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -174,7 +169,7 @@ using namespace ::com::sun::star;
/*?*/ else
/*?*/ {
/*?*/ aStr += "von ";
-/*?*/ aStr += ByteString::CreateFromInt32( nCloneErrCnt );
+/*?*/ aStr += ByteString_CreateFromInt32( nCloneErrCnt );
/*?*/ aStr += " Zeichenobjekten.";
/*?*/ }
/*?*/
@@ -914,18 +909,18 @@ using namespace ::com::sun::star;
/*?*/ UINT32 nPos(GetObjCount());
/*?*/
/*?*/ aStr += "Listenposition: ";
-/*?*/ aStr += ByteString::CreateFromInt32( nPos );
+/*?*/ aStr += ByteString_CreateFromInt32( nPos );
/*?*/ aStr += "\n";
/*?*/ aStr += "Inventor: ";
/*?*/ sal_Int32 nInv = SWAPLONG( aHead.nInventor );
-/*?*/ aStr += ByteString::CreateFromInt32( nInv );
+/*?*/ aStr += ByteString_CreateFromInt32( nInv );
/*?*/ aStr += ", Identifier: ";
-/*?*/ aStr += ByteString::CreateFromInt32( aHead.nIdentifier );
+/*?*/ aStr += ByteString_CreateFromInt32( aHead.nIdentifier );
/*?*/ aStr += "\n";
/*?*/ aStr += "FilePos: ";
-/*?*/ aStr += ByteString::CreateFromInt32( aHead.GetFilePos() );
+/*?*/ aStr += ByteString_CreateFromInt32( aHead.GetFilePos() );
/*?*/ aStr += ", BlockSize: ";
-/*?*/ aStr += ByteString::CreateFromInt32( aHead.GetBlockSize() );
+/*?*/ aStr += ByteString_CreateFromInt32( aHead.GetBlockSize() );
/*?*/
/*?*/ OSL_FAIL(aStr.GetBuffer());
/*?*/ #endif
diff --git a/binfilter/bf_sw/source/core/text/porlay.hxx b/binfilter/bf_sw/source/core/text/porlay.hxx
index 68eb638..f142312 100644
--- a/binfilter/bf_sw/source/core/text/porlay.hxx
+++ b/binfilter/bf_sw/source/core/text/porlay.hxx
@@ -200,11 +200,6 @@ public:
void CreateSpaceAdd( const short nInit = 0 );
-#ifdef DBG_UTIL
- void DebugPortions( SvStream &rOs, const XubString &rTxt,
- const xub_StrLen nStart ); //$ ostream
-#endif
-
OUTPUT_OPERATOR
DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
};
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index ba269c1..95cba6f 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -352,10 +352,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ void SwLineLayout::DebugPortions( SvStream &, const XubString &, const xub_StrLen )
-/*N*/ {
-/*N*/ }
-
/*N*/ const char *GetLangName( const MSHORT )
/*N*/ {
/*N*/ return 0;
@@ -471,48 +467,6 @@ namespace binfilter {
/*N*/ return( ppNameArr[ePrep] );
/*N*/ }
-/*************************************************************************
- * SwLineLayout::DebugPortions()
- *
- * DebugPortion() iteriert ueber alle Portions einer Zeile und deckt die
- * internen Strukturen auf.
- * Im Gegensatz zum Ausgabe-Operator werden auch die Textteile ausgegeben.
- *************************************************************************/
-
-/*N*/ void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &rTxt, //$ ostream
-/*N*/ const xub_StrLen nStart )
-/*N*/ {
-/*N*/ SwLinePortion *pPortion = GetPortion();
-/*N*/
-/*N*/ xub_StrLen nPos = 0;
-/*N*/ MSHORT nNr = 0;
-/*N*/ KSHORT nPrtWidth, nLastPrt;
-/*N*/ nPrtWidth = nLastPrt = 0;
-/*N*/
-/*N*/ SwLinePortion::operator<<( rOs );
-/*N*/ rOs << '\"' << endl;
-/*N*/
-/*N*/ while( pPortion )
-/*N*/ {
-///*N*/ DBG_LOOP;
-/*N*/ SwTxtPortion *pTxtPor = pPortion->InTxtGrp() ?
-/*N*/ (SwTxtPortion *)pPortion : NULL ;
-/*N*/ ++nNr;
-/*N*/ nLastPrt = nPrtWidth;
-/*N*/ nPrtWidth += pPortion->PrtWidth();
-/*N*/ rOs << "\tNr:" << nNr
-/*N*/ << " Pos:" << nPos
-/*N*/ << " Org:" << nLastPrt
-/*N*/ << endl;
-/*N*/
-/*N*/ rOs << "\t";
-/*N*/ pPortion->operator<<( rOs );
-/*N*/ rOs << endl;
-/*N*/ nPos += pPortion->GetLen();
-/*N*/ pPortion = pPortion->GetPortion();
-/*N*/ }
-/*N*/ }
-
/*N*/ #ifdef USED
/*N*/ CONSTCHAR( pRES_LNG_ALBANIAN, "ALBANIAN" );
/*N*/ CONSTCHAR( pRES_LNG_ARABIC, "ARABIC" );
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index a24f8ab..8d3e3c3 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -44,6 +44,8 @@
#include <paratr.hxx>
#include <bf_svx/tstpitem.hxx>
#include <SwStyleNameMapper.hxx>
+#include <bf_tools/string.hxx>
+
namespace binfilter {
/*N*/ const sal_Char* SwForm::aFormEntry = "<E>";
@@ -301,14 +303,14 @@ String lcl_GetAuthPattern(USHORT nTypeId)
/*N*/ if(TOX_CONTENT == nType)
/*N*/ {
/*N*/ //the most right tab stop is "most_right_aligned"
-/*N*/ sTmp += ByteString::CreateFromInt32( SVX_TAB_ADJUST_END );
+/*N*/ sTmp += ByteString_CreateFromInt32( SVX_TAB_ADJUST_END );
/*N*/ //and has a dot as FillChar
/*N*/ sTmp.Append( RTL_CONSTASCII_STRINGPARAM( ",." ));
/*N*/ sBStr.Insert(sTmp, sBStr.Len() - 1);
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ sTmp += ByteString::CreateFromInt32( SVX_TAB_ADJUST_LEFT );
+/*N*/ sTmp += ByteString_CreateFromInt32( SVX_TAB_ADJUST_LEFT );
/*N*/ //and has a space as FillChar
/*N*/ sTmp.Append( RTL_CONSTASCII_STRINGPARAM( ", " ));
/*N*/ }
@@ -426,24 +428,6 @@ String lcl_GetAuthPattern(USHORT nTypeId)
/*N*/ return sRet;
/*N*/ }
-/*N*/ USHORT SwForm::GetFirstTabPos() const //{ return nFirstTabPos; }
-/*N*/ {
-/*N*/ DBG_WARNING("compatibility");
-/*N*/ String sFirstLevelPattern = aPattern[ 1 ];
-/*N*/ USHORT nRet = 0;
-/*N*/ if( 2 <= ::binfilter::lcl_GetPatternCount( sFirstLevelPattern, SwForm::aFormTab ))
-/*N*/ {
-/*N*/ //sTab is in the Form "<T ,,value>" where value is the tab position an may be empty
-/*N*/ String sTab = lcl_GetPattern( sFirstLevelPattern, SwForm::aFormTab );
-/*N*/ if( 3 <= sTab.GetTokenCount(',') )
-/*N*/ {
-/*N*/ sTab = sTab.GetToken( 2, ',');
-/*N*/ sTab.Erase( sTab.Len() - 1, 1 );
-/*N*/ nRet = sTab.ToInt32();
-/*N*/ }
-/*N*/ }
-/*N*/ return nRet;
-/*N*/ }
void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
{
// the tab stop token looks like: <T ,,1234,0,.> <T> <T ,,1234>
@@ -608,13 +592,6 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ }
/*N*/ }
/*N*/ }
-//-----------------------------------------------------------------------------
-
-/*N*/ BOOL SwForm::IsFirstTabPosFlag() const //{ return bHasFirstTabPos; }
-/*N*/ {
-/*N*/ //rturn true if the first level contains two ore more tabstops
-/*N*/ return 2 <= lcl_GetPatternCount(aPattern[ 1 ], SwForm::aFormTab);
-/*N*/ }
/*N*/ String SwForm::ConvertPatternFrom51(const String& rSource, TOXTypes eType)
/*N*/ {
diff --git a/binfilter/inc/bf_starmath/utility.hxx b/binfilter/inc/bf_starmath/utility.hxx
index a2b292f..5b41d8b 100644
--- a/binfilter/inc/bf_starmath/utility.hxx
+++ b/binfilter/inc/bf_starmath/utility.hxx
@@ -47,7 +47,6 @@ class SmRect;
/////////////////////////////////////////////////////////////////
-const ByteString ExportString( const String& rString );
const String ImportString( const ByteString& rByteString );
/////////////////////////////////////////////////////////////////
@@ -99,7 +98,6 @@ SmViewShell * SmGetActiveView();
class SmFace;
-SvStream& operator << (SvStream& rStream, const SmFace& rFont);
SvStream& operator >> (SvStream& rStream, SmFace& rFont);
void ReadSM20Font(SvStream& rStream, Font& rFont);
diff --git a/binfilter/inc/bf_sw/tox.hxx b/binfilter/inc/bf_sw/tox.hxx
index b6b8a8e..f7874ab 100644
--- a/binfilter/inc/bf_sw/tox.hxx
+++ b/binfilter/inc/bf_sw/tox.hxx
@@ -262,11 +262,8 @@ public:
inline USHORT GetTOXType() const;
inline USHORT GetFormMax() const;
- USHORT GetFirstTabPos() const ; //{ return nFirstTabPos; }
void SetFirstTabPos( USHORT n ); //{ nFirstTabPos = n; }
- BOOL IsFirstTabPosFlag() const ; //{ return bHasFirstTabPos; }
-
BOOL IsGenerateTabPos() const { return bGenerateTabPos; }
void SetGenerateTabPos( BOOL b ) { bGenerateTabPos = b; }
commit 5ac26d88a5b6e5757bdb0613d7e9ba2b114c2a7e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 29 23:30:08 2011 +0100
ditch this
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index 02cf70c..f151eb9 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -132,46 +132,9 @@ namespace binfilter {
/*N*/ }
#ifdef DBG_UTIL
-
-
/*N*/ SwCache::~SwCache()
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ #ifndef MAC
-/*N*/ {
-/*N*/ ByteString sOut( aName ); sOut += '\n';
-/*N*/ (( sOut += "Anzahl neuer Eintraege: " )
-/*N*/ += ByteString::CreateFromInt32( nAppend ))+= '\n';
-/*N*/ (( sOut += "Anzahl Insert auf freie Plaetze: " )
-/*N*/ += ByteString::CreateFromInt32( nInsertFree ))+= '\n';
-/*N*/ (( sOut += "Anzahl Ersetzungen: " )
-/*N*/ += ByteString::CreateFromInt32( nReplace ))+= '\n';
-/*N*/ (( sOut += "Anzahl Erfolgreicher Get's: " )
-/*N*/ += ByteString::CreateFromInt32( nGetSuccess ))+= '\n';
-/*N*/ (( sOut += "Anzahl Fehlgeschlagener Get's: " )
-/*N*/ += ByteString::CreateFromInt32( nGetFail ))+= '\n';
-/*N*/ (( sOut += "Anzahl Umsortierungen (LRU): " )
-/*N*/ += ByteString::CreateFromInt32( nToTop ))+= '\n';
-/*N*/ (( sOut += "Anzahl Loeschungen: " )
-/*N*/ += ByteString::CreateFromInt32( nDelete ))+= '\n';
-/*N*/ (( sOut += "Anzahl Get's ohne Index: " )
-/*N*/ += ByteString::CreateFromInt32( nGetSeek ))+= '\n';
-/*N*/ (( sOut += "Anzahl Seek fuer Get ohne Index: " )
-/*N*/ += ByteString::CreateFromInt32( nAverageSeekCnt ))+= '\n';
-/*N*/ (( sOut += "Anzahl Flush-Aufrufe: " )
-/*N*/ += ByteString::CreateFromInt32( nFlushCnt ))+= '\n';
-/*N*/ (( sOut += "Anzahl geflush'ter Objekte: " )
-/*N*/ += ByteString::CreateFromInt32( nFlushedObjects ))+= '\n';
-/*N*/ (( sOut += "Anzahl Cache-Erweiterungen: " )
-/*N*/ += ByteString::CreateFromInt32( nIncreaseMax ))+= '\n';
-/*N*/ (( sOut += "Anzahl Cache-Verkleinerungen: " )
-/*N*/ += ByteString::CreateFromInt32( nDecreaseMax ))+= '\n';
-/*N*/
-/*N*/ OSL_FAIL( sOut.GetBuffer() );
-/*N*/ }
/*N*/ Check();
-/*N*/ #endif
-/*N*/ #endif
/*N*/ }
#endif
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index 3455201..1ed7023 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -1543,18 +1543,6 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
bAnyContent = sal_True;
break;
default:
-#ifdef DBG_UTIL
- // NF_SYMBOLTYPE_PERCENT is the last known value newly
- // introduced, alert on newer values, decreasing <0, which
- // most certainly means having to synchronize with module
- // 'xmloff'.
- if (nElemType < NF_SYMBOLTYPE_PERCENT)
- {
- ByteString aMsg( "SvXMLNumFmtExport::ExportPart_Impl: unhandled symbol type: ");
- aMsg += ByteString::CreateFromInt32( nElemType);
- DBG_ERRORFILE( aMsg.GetBuffer());
- }
-#endif
break;
}
nPrevType = nElemType;
More information about the Libreoffice-commits
mailing list