[Libreoffice-commits] .: 20 commits - basic/source editeng/source linguistic/inc linguistic/source sfx2/source svx/inc svx/source xmlhelp/source xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 15 04:28:05 PST 2011
basic/source/classes/disas.cxx | 13
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 17 -
editeng/source/editeng/editeng.cxx | 27 -
editeng/source/items/numitem.cxx | 34 --
editeng/source/misc/splwrap.cxx | 10
editeng/source/rtf/rtfgrf.cxx | 36 --
editeng/source/rtf/svxrtf.cxx | 12
linguistic/inc/misc.hxx | 8
linguistic/source/misc2.cxx | 63 ---
sfx2/source/appl/shutdowniconunx.cxx | 12
sfx2/source/dialog/about.cxx | 5
svx/inc/svdshort.hxx | 93 -----
svx/inc/svx/msdffdef.hxx | 34 --
svx/inc/svx/sdangitm.hxx | 4
svx/inc/svx/sdasaitm.hxx | 5
svx/inc/svx/sdasitm.hxx | 3
svx/inc/svx/sdmetitm.hxx | 4
svx/inc/svx/sdooitm.hxx | 4
svx/inc/svx/sdprcitm.hxx | 8
svx/inc/svx/sdtfchim.hxx | 4
svx/inc/svx/sdynitm.hxx | 3
svx/inc/svx/svdetc.hxx | 12
svx/inc/svx/sxfiitm.hxx | 3
svx/inc/svx/xbitmap.hxx | 4
svx/source/items/customshapeitem.cxx | 28 -
svx/source/svdraw/svdattr.cxx | 72 ----
svx/source/table/tablemodel.cxx | 70 ----
xmlhelp/source/cxxhelp/provider/databases.cxx | 20 -
xmlhelp/source/cxxhelp/provider/db.cxx | 202 ------------
xmlhelp/source/cxxhelp/provider/db.hxx | 6
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 56 ---
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 8
xmloff/source/style/bordrhdl.cxx | 39 --
xmloff/source/text/txtimppr.cxx | 57 ---
34 files changed, 9 insertions(+), 967 deletions(-)
New commits:
commit 4aae3aee4ac2ba3b73c43b3c7915099964c72581
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 08:58:46 2011 +0100
Remove HP9000 - revert ifndef
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 8b1794b..2350e92 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -608,6 +608,11 @@ void SbiDisas::TypeOp( String& rText )
}
if( nOp1 < 13 )
{
+ static char pTypes[][13] = {
+ "Empty","Null","Integer","Long","Single","Double",
+ "Currency","Date","String","Object","Error","Boolean",
+ "Variant" };
+
rText.AppendAscii( pTypes[ nOp1 ] );
}
else
commit ed741ca2ef76d41195d104b5444f6ec84fafdd02
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:21:49 2011 +0100
Remove XML_CHECK_UI_CON(T)STRAINS
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index c640b65..836c989 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -198,31 +198,6 @@ void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sal_uInt1
void lcl_frmitems_setXMLBorderWidth( table::BorderLine &rBorderLine,
sal_uInt16 nWidth, sal_Bool bDouble )
{
-#ifdef XML_CHECK_UI_CONTSTRAINS
- const sal_uInt16 *aWidths;
- sal_uInt16 nSize;
- if( !bDouble )
- {
- aWidths = aSBorderWidths;
- nSize = sizeof( aSBorderWidths );
- }
- else
- {
- aWidths = aDBorderWidths;
- nSize = sizeof( aDBorderWidths );
- }
-
- sal_uInt16 i = (nSize / sizeof(sal_uInt16)) - 4;
- while( i>0 &&
- nWidth <= ((aWidths[i] + aWidths[i-4]) / 2) )
- {
- i -= 4;
- }
-
- rBorderLine.OuterLineWidth = aWidths[i+1];
- rBorderLine.InnerLineWidth = aWidths[i+2];
- rBorderLine.LineDistance = aWidths[i+3];
-#else
if( bDouble )
{
const sal_uInt16 *aWidths = aDBorderWidths;
@@ -245,7 +220,6 @@ void lcl_frmitems_setXMLBorderWidth( table::BorderLine &rBorderLine,
rBorderLine.LineDistance = 0;
}
-#endif
}
@@ -284,19 +258,6 @@ sal_Bool XMLBorderWidthHdl::importXML( const OUString& rStrImpValue, uno::Any& r
if( !rUnitConverter.convertMeasure( nOutWidth, aToken, 0, 500 ) )
return sal_False;
-#ifdef XML_CHECK_UI_CONSTRAINS
- sal_uInt16 nSize = sizeof( aDBorderWidths );
- for( sal_uInt16 i=0; i < nSize; i += 4 )
- {
- if( aDBorderWidths[i+1] == nOutWidth &&
- aDBorderWidths[i+2] == nInWidth &&
- aDBorderWidths[i+3] == nDistance )
- break;
- }
-
- sal_uInt16 nWidth = i < nSize ? 0 : nOutWidth + nInWidth + nDistance;
-#endif
-
table::BorderLine2 aBorderLine;
if(!(rValue >>= aBorderLine))
aBorderLine.Color = 0;
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 15ce2da..92b80ac 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -435,62 +435,6 @@ void XMLTextImportPropertyMapper::finished(
else
pBorderWidths[i]->mnIndex = -1;
-#ifdef XML_CHECK_UI_CONSTRAINS
- sal_Bool bHasBorder = sal_False;
- if( pBorders[i] )
- {
- table::BorderLine2 aBorderLine;
- pBorders[i]->maValue >>= aBorderLine;
-
- if( pBorderWidths[i] )
- {
- table::BorderLine2 aBorderLineWidth;
- pBorderWidths[i]->maValue >>= aBorderLineWidth;
- aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
- aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
- aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-
- pBorders[i]->maValue <<= aBorderLine;
- }
- bHasBorder = (aBorderLine.OuterLineWidth +
- aBorderLine.InnerLineWidth) > 0;
- }
- if( bHasBorder )
- {
- if( !pBorderDistances[i] )
- {
-#ifdef DBG_UTIL
- sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
- pBorders[i]->mnIndex + 5 );
- DBG_ASSERT( nTmp >= CTF_LEFTBORDERDISTANCE &&
- nTmp <= CTF_BOTTOMBORDERDISTANCE,
- "wrong property context id" );
-#endif
-
- pNewBorderDistances[i] =
- new XMLPropertyState( pBorders[i]->mnIndex + 5 );
- pNewBorderDistances[i]->maValue <<= (sal_Int32)MIN_BORDER_DIST;
- pBorderDistances[i] = pNewBorderDistances[i];
- }
- else
- {
- sal_Int32 nDist;
- pBorderDistances[i]->maValue >>= nDist;
- if( nDist < MIN_BORDER_DIST )
- pBorderDistances[i]->maValue <<= (sal_Int32)MIN_BORDER_DIST;
- }
- }
- else
- {
- if( pBorderDistances[i] )
- {
- sal_Int32 nDist;
- pBorderDistances[i]->maValue >>= nDist;
- if( nDist > 0 )
- pBorderDistances[i]->maValue <<= (sal_Int32)0;
- }
- }
-#else
if( pBorders[i] && pBorderWidths[i] )
{
table::BorderLine2 aBorderLine;
@@ -505,7 +449,6 @@ void XMLTextImportPropertyMapper::finished(
pBorders[i]->maValue <<= aBorderLine;
}
-#endif
}
if( pAllBorderDistance )
pAllBorderDistance->mnIndex = -1;
commit 000b5a902778f025e2e44ce1a94e3296a943f22e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:18:16 2011 +0100
Remove TEST_DBHELP
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index df0c627..3e359dd 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -664,15 +664,6 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
{
DBHelp* pDBHelp = new DBHelp( fileNameDBHelp, m_xSFA );
table->setDBHelp( pDBHelp );
-
-#ifdef TEST_DBHELP
- bool bSuccess;
- bool bOldDbAccess = false;
- bSuccess = pDBHelp->testAgainstDb( fileName, bOldDbAccess );
-
- bOldDbAccess = true;
- bSuccess = pDBHelp->testAgainstDb( fileName, bOldDbAccess );
-#endif
}
else if( table->open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
{
@@ -1007,17 +998,6 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
if( pDBHelp != NULL )
pDBHelp->releaseHashMap();
}
-
-#ifdef TEST_DBHELP
- bool bSuccess;
- bool bOldDbAccess = false;
- bSuccess = aDBHelp.testAgainstDb( fileName, bOldDbAccess );
-
- bOldDbAccess = true;
- bSuccess = aDBHelp.testAgainstDb( fileName, bOldDbAccess );
-
- int nDummy = 0;
-#endif
}
else if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 4cce60f..e843519 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -36,10 +36,6 @@
#include "com/sun/star/io/XSeekable.hpp"
-#ifdef TEST_DBHELP
-#include <osl/time.h>
-#endif
-
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::io;
@@ -92,204 +88,6 @@ bool DBHelp::implReadLenAndData( const char* pData, int& riPos, DBData& rValue )
return bSuccess;
}
-#ifdef TEST_DBHELP
-
-typedef std::pair< rtl::OString, rtl::OString > KeyValPair;
-typedef std::vector< KeyValPair > KeyValPairVector;
-
-void testWriteKeyValue( FILE* pFile, const KeyValPair& rKeyValPair )
-{
- if( pFile == NULL )
- return;
- char cLF = 10;
-
- const rtl::OString& aKeyStr = rKeyValPair.first;
- const rtl::OString& aValueStr = rKeyValPair.second;
- int nKeyLen = aKeyStr.getLength();
- int nValueLen = aValueStr.getLength();
- fprintf( pFile, "%x ", nKeyLen );
- if( nKeyLen > 0 )
- fwrite( aKeyStr.getStr(), 1, nKeyLen, pFile );
- fprintf( pFile, " %x ", nValueLen );
- if( nValueLen > 0 )
- fwrite( aValueStr.getStr(), 1, nValueLen, pFile );
- fprintf( pFile, "%c", cLF );
-}
-
-bool DBHelp::testAgainstDb( const rtl::OString& fileName, bool bOldDbAccess )
-{
- bool bSuccess = true;
-
- KeyValPairVector avKeyValPair;
-
- rtl::OString aOutFileName = fileName;
- aOutFileName += "_TestOut";
- if( bOldDbAccess )
- aOutFileName += "_Old";
- FILE* pFile = fopen( aOutFileName.getStr(), "wb" );
-
- // Get all values
- Db table;
- if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
- {
- bool first = true;
-
- Dbc* cursor = 0;
- table.cursor( 0,&cursor,0 );
- Dbt key_,data;
- key_.set_flags( DB_DBT_MALLOC ); // Initially the cursor must allocate the necessary memory
- data.set_flags( DB_DBT_MALLOC );
-
- while( cursor && DB_NOTFOUND != cursor->get( &key_,&data,DB_NEXT ) )
- {
- rtl::OString keyword( static_cast<sal_Char*>(key_.get_data()),
- key_.get_size() );
- rtl::OString value( static_cast<sal_Char*>(data.get_data()),
- data.get_size() );
-
- KeyValPair aPair( keyword, value );
- avKeyValPair.push_back( aPair );
- if( pFile != NULL )
- testWriteKeyValue( pFile, aPair );
-
- if( first )
- {
- key_.set_flags( DB_DBT_REALLOC );
- data.set_flags( DB_DBT_REALLOC );
- first = false;
- }
- }
-
- if( cursor ) cursor->close();
- }
- table.close( 0 );
-
- // TEST
- DBData aDBData;
- Db tableTest;
- Dbt data;
-
- int nOkCount = 0;
- int nErrCount = 0;
-
- bool bTestSuccess;
- const char* pTestReadData = NULL;
- int nTestReadDataSize = 0;
-
- sal_uInt32 starttime = osl_getGlobalTimer();
- sal_uInt32 afterfirsttime = starttime;
-
- if( pFile != NULL )
- {
- if( bOldDbAccess )
- fprintf( pFile, "\nTesting old access:\n" );
- else
- fprintf( pFile, "\nTesting new access:\n" );
- }
-
- KeyValPairVector::const_iterator it;
- bool bFirst = true;
- for( it = avKeyValPair.begin() ; it != avKeyValPair.end() ; ++it )
- {
- const KeyValPair& rKeyValPair = *it;
-
- const rtl::OString& aKeyStr = rKeyValPair.first;
- const rtl::OString& aValueStr = rKeyValPair.second;
- int nKeyLen = aKeyStr.getLength();
- int nValueLen = aValueStr.getLength();
-
- const sal_Char* ptr = aValueStr.getStr();
-
- bTestSuccess = false;
- pTestReadData = NULL;
- nTestReadDataSize = 0;
- if( bOldDbAccess )
- {
- if( bFirst )
- {
- if( tableTest.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
- {
- if( pFile != NULL )
- fprintf( pFile, "Cannot open database\n" );
-
- break;
- }
- }
-
- Dbt key( static_cast< void* >( const_cast< sal_Char* >( aKeyStr.getStr() ) ), aKeyStr.getLength() );
- int err = tableTest.get( 0, &key, &data, 0 );
- if( err == 0 )
- {
- bTestSuccess = true;
- pTestReadData = static_cast< sal_Char* >( data.get_data() );
- nTestReadDataSize = data.get_size();
- }
- }
- else
- {
- bTestSuccess = getValueForKey( aKeyStr, aDBData );
- if( bTestSuccess )
- {
- pTestReadData = aDBData.getData();
- nTestReadDataSize = aDBData.getSize();
- }
- }
- if( bFirst )
- {
- afterfirsttime = osl_getGlobalTimer();
- bFirst = false;
- }
- int nError = 0;
- if( bTestSuccess && pTestReadData != NULL )
- {
- int nCmp = memcmp( ptr, pTestReadData, nValueLen );
- if( nCmp == 0 )
- ++nOkCount;
- else
- nError = 1;
-
- if( nValueLen != nTestReadDataSize )
- nError = 2;
- }
- else
- nError = 3;
-
- if( nError != 0 )
- {
- bSuccess = false;
- ++nErrCount;
-
- if( pFile != NULL )
- {
- fprintf( pFile, "ERROR, not found:\n" );
- testWriteKeyValue( pFile, rKeyValPair );
- fprintf( pFile, "\nError Code: %d\n", nError );
- }
- }
- }
- tableTest.close( 0 );
-
- sal_uInt32 endtime = osl_getGlobalTimer();
- double dDiffTime = (endtime-starttime) / 1000.0;
- double dDiffFirstTime = (afterfirsttime-starttime) / 1000.0;
- if( pFile != NULL )
- {
- int nCount = avKeyValPair.size();
- fprintf( pFile, "%d key/values in total, read %d correctly, %d errors\n",
- nCount, nOkCount, nErrCount );
- fprintf( pFile, "Time taken: %g s (First access %g s)\n", dDiffTime, dDiffFirstTime );
- fprintf( pFile, "Average time per access: %g s\n", dDiffTime / nCount );
- }
-
- if( pFile != NULL )
- fclose( pFile );
-
- return bSuccess;
-}
-
-#endif
-
-
void DBHelp::createHashMap( bool bOptimizeForPerformance )
{
releaseHashMap();
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index aaa6f5d..fd51511 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -89,8 +89,6 @@ namespace berkeleydbproxy {
};
-//#define TEST_DBHELP
-
class DBData
{
friend class DBHelp;
@@ -150,10 +148,6 @@ namespace berkeleydbproxy {
void createHashMap( bool bOptimizeForPerformance = false );
void releaseHashMap( void );
-#ifdef TEST_DBHELP
- bool testAgainstDb( const rtl::OString& fileName, bool bOldDbAccess );
-#endif
-
bool getValueForKey( const rtl::OString& rKey, DBData& rValue );
bool startIteration( void );
commit 008f3b2b18968e95f2e949378f7aa897e3316418
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:16:38 2011 +0100
Remove LOGGING
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 0501c1e..5b41701 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -49,9 +49,6 @@
#include "resultsetforquery.hxx"
#include "databases.hxx"
-// For testing
-// #define LOGGING
-
using namespace std;
using namespace chelp;
using namespace xmlsearch::excep;
@@ -141,10 +138,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
bool bCaptionsOnly = ( scope.compareToAscii( "Heading" ) == 0 );
sal_Int32 hitCount = m_aURLParameter.get_hitCount();
-#ifdef LOGGING
- FILE* pFile = fopen( "d:\\resultset_out.txt", "w" );
-#endif
-
IndexFolderIterator aIndexFolderIt( *pDatabases, m_aURLParameter.get_module(), m_aURLParameter.get_language() );
rtl::OUString idxDir;
bool bExtension = false;
@@ -235,14 +228,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
pQueryResultVector->push_back( HitItem( aURL, fScore ) );
if( nQueryListSize > 1 )
aSet.insert( aURL );
-
-#ifdef LOGGING
- if( pFile )
- {
- rtl::OString tmp(rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8));
- fprintf( pFile, "Dir %d, Query %d, Item: score=%f, URL=%s\n", iDir, i, fScore, tmp.getStr() );
- }
-#endif
}
}
@@ -285,14 +270,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
{
// Use first pass to create entry
aIndexFolderResultVector.push_back( aItemCopy );
-
-#ifdef LOGGING
- if( pFile )
- {
- rtl::OString tmp(rtl::OUStringToOString( aItemCopy.m_aURL, RTL_TEXTENCODING_UTF8));
- fprintf( pFile, "Combine: Query %d (first pass), Item %d: score=%f (%f), URL=%s\n", n, i, aItemCopy.m_fScore, rItem.m_fScore, tmp.getStr() );
- }
-#endif
}
else
{
@@ -303,15 +280,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
HitItem& rFindItem = aIndexFolderResultVector[ j ];
if( rFindItem.m_aURL.equals( aItemCopy.m_aURL ) )
{
-#ifdef LOGGING
- if( pFile )
- {
- rtl::OString tmp(rtl::OUStringToOString( aItemCopy.m_aURL, RTL_TEXTENCODING_UTF8));
- fprintf( pFile, "Combine: Query %d, Item %d: score=%f + %f = %f, URL=%s\n", n, i,
- rFindItem.m_fScore, aItemCopy.m_fScore, rFindItem.m_fScore + aItemCopy.m_fScore, tmp.getStr() );
- }
-#endif
-
rFindItem.m_fScore += aItemCopy.m_fScore;
break;
}
@@ -347,26 +315,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
for( int j = 0 ; j < nVectorCount ; ++j )
pCurrentVectorIndex[j] = 0;
-#ifdef LOGGING
- if( pFile )
- {
- for( int k = 0 ; k < nVectorCount ; ++k )
- {
- vector<HitItem>& rIndexFolderVector = *aIndexFolderResultVectorVector[k];
- int nItemCount = rIndexFolderVector.size();
-
- fprintf( pFile, "Vector %d, %d elements\n", k, nItemCount );
-
- for( int i = 0 ; i < nItemCount ; ++i )
- {
- const HitItem& rItem = rIndexFolderVector[ i ];
- rtl::OString tmp(rtl::OUStringToOString(rItem.m_aURL, RTL_TEXTENCODING_UTF8));
- fprintf( pFile, " Item_vector%d, %d/%d: score=%f, URL=%s\n", k, i, nItemCount, rItem.m_fScore, tmp.getStr() );
- }
- }
- }
-#endif
-
sal_Int32 nTotalHitCount = m_aURLParameter.get_hitCount();
sal_Int32 nHitCount = 0;
while( nHitCount < nTotalHitCount )
@@ -406,10 +354,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
vector<HitItem>* pIndexFolderVector = aIndexFolderResultVectorVector[n];
delete pIndexFolderVector;
}
-
-#ifdef LOGGING
- fclose( pFile );
-#endif
}
sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength();
commit 9a1dc84889c192a24e7c482065ae38dbb9f04511
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:15:39 2011 +0100
Remove WORKAROUND_98119
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 3b5b30b..164d1dc 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -29,11 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmlhelp.hxx"
-#define WORKAROUND_98119
-
-#ifdef WORKAROUND_98119
#include "bufferedinputstream.hxx"
-#endif
#include <string.h>
#include <osl/diagnose.hxx>
@@ -537,11 +533,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{
}
}
-#ifdef WORKAROUND_98119
xDataSink->setInputStream( turnToSeekable(xStream) );
-#else
- xDataSink->setInputStream( xStream );
-#endif
}
else
// a standard document or else an active help text, plug in the new input stream
commit 2edd99e91cb5531514937ce7c277dd5f41fa0200
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:14:16 2011 +0100
Remove PLEASE_DEBUG_THE_TABLES and some dead code
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index baa1c02..329b0f5 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -50,8 +50,6 @@
#include "svdstr.hrc"
#include "svdglob.hxx"
-//#define PLEASE_DEBUG_THE_TABLES 1
-
using ::rtl::OUString;
using namespace ::osl;
using namespace ::com::sun::star::uno;
@@ -610,10 +608,6 @@ void TableModel::unlockBroadcasts() throw (RuntimeException)
}
// -----------------------------------------------------------------------------
-#ifdef PLEASE_DEBUG_THE_TABLES
-#include <stdio.h>
-#endif
-
void TableModel::notifyModification()
{
::osl::MutexGuard guard( m_aMutex );
@@ -633,50 +627,6 @@ void TableModel::notifyModification()
{
mbNotifyPending = true;
}
-
-#ifdef PLEASE_DEBUG_THE_TABLES
- FILE* file = fopen( "c:\\table.xml","w" );
-
- const sal_Int32 nColCount = getColumnCountImpl();
- const sal_Int32 nRowCount = getRowCountImpl();
-
- fprintf( file, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\r" );
- fprintf( file, "<table columns=\"%ld\" rows=\"%ld\" updated=\"%s\">\n\r", nColCount, nRowCount, mbNotifyPending ? "false" : "true");
-
- for( sal_Int32 nCol = 0; nCol < nColCount; ++nCol )
- {
- fprintf( file, "<column this=\"%lx\"/>\n\r", maColumns[nCol].get() );
- }
-
- // first check merged cells before and inside the removed rows
- for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow )
- {
- fprintf( file, "<row this=\"%lx\">\n\r", maRows[nRow].get() );
- for( sal_Int32 nCol = 0; nCol < nColCount; ++nCol )
- {
- CellRef xCell( getCell( nCol, nRow ) );
- fprintf( file, "<cell this=\"%lx\"", xCell.get() );
-
- sal_Int32 nRowSpan = xCell->getRowSpan();
- sal_Int32 nColSpan = xCell->getColumnSpan();
- sal_Bool bMerged = xCell->isMerged();
-
- if( nColSpan != 1 )
- fprintf( file, " column-span=\"%ld\"", nColSpan );
- if( nRowSpan != 1 )
- fprintf( file, " row-span=\"%ld\"", nRowSpan );
-
- if( bMerged )
- fprintf( file, " merged=\"true\"" );
-
- fprintf( file, "/>" );
- }
- fprintf( file, "\n\r</row>\n\r" );
- }
-
- fprintf( file, "</table>\n\r" );
- fclose( file );
-#endif
}
// -----------------------------------------------------------------------------
@@ -695,26 +645,6 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const
}
// -----------------------------------------------------------------------------
-/*
-bool TableModel::getCellPos( const CellRef& xCell, ::sal_Int32& rnCol, ::sal_Int32& rnRow ) const
-{
- const sal_Int32 nRowCount = getRowCount();
- const sal_Int32 nColCount = getColumnCount();
- for( rnRow = 0; rnRow < nRowCount; rnRow++ )
- {
- for( rnCol = 0; rnCol < nColCount; rnCol++ )
- {
- if( maRows[rnRow]->maCells[rnCol] == xCell )
- {
- return true;
- }
- }
- }
- return false;
-}
-*/
-
-// -----------------------------------------------------------------------------
CellRef TableModel::createCell()
{
commit 26c0b002dba7a43524854ce2f5939a8267435671
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:12:40 2011 +0100
Remove some dead code
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index f74a37c..277de0f 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -71,9 +71,6 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea
sal_Int32 i, j;
aPropSeq = rVal;
- // hashing property values
-// beans::PropertyValue* pPropValues = aPropSeq.getArray();
-// const rtl::OUString* pPtr = NULL;
for ( i = 0; i < aPropSeq.getLength(); i++ )
{
beans::PropertyValue& rPropVal = aPropSeq[ i ];
@@ -309,7 +306,6 @@ SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation(
if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE )
{
XubString aStr;
-// SdrItemPool::TakeItemName( Which(), aStr );
aStr += sal_Unicode( ' ' );
rText.Insert( aStr, 0 );
}
@@ -332,17 +328,7 @@ SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVer
SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
{
- SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( GetGeometry() );
-// SdrCustomShapeGeometryItem* pItem = new SdrCustomShapeGeometryItem( *this );
-
-/*
- for ( i = 0; i < GetCount(); i++ )
- {
- const SdrCustomShapeAdjustmentValue& rVal = GetValue( i );
- pItem->SetValue( i, rVal );
- }
-*/
- return pItem;
+ return new SdrCustomShapeGeometryItem( GetGeometry() );
}
sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
@@ -365,12 +351,7 @@ const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeom
{
return aPropSeq;
}
-/*
-const uno::Any* GetValueByName( const rtl::OUString& rProperty ) const
-{
-}
-*/
SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem()
: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, String() )
{}
commit 3602bbdccddc7916075d0d6105037d95c2ec67d0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:10:49 2011 +0100
Remove SDR_ISPOOLABLE
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index 7804858..2ca6713 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -50,10 +50,6 @@ public:
String& rText,
const IntlWrapper *
pIntlWrapper = 0) const;
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 418023d..75525d4 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -68,11 +68,6 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
-
sal_uInt32 GetCount() const { return aAdjustmentValueList.Count(); };
SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const;
SVX_DLLPUBLIC void SetValue( sal_uInt32 nIndex,
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 0a87f50..c8a381e 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -105,9 +105,6 @@ private:
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName );
com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName, const rtl::OUString& rPropName2 );
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index a061707..3ef6fa5 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -52,10 +52,6 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String& rText, const IntlWrapper * = 0) const;
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index d5697bf..193edd3 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -49,10 +49,6 @@ public:
virtual String GetValueTextByVal(BOOL bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index efff820..79b3b64 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -48,10 +48,6 @@ public:
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
//------------------------------------------------------------
@@ -70,10 +66,6 @@ public:
virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const;
-
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index aa3ce73..db42edd 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -49,10 +49,6 @@ public:
SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-#ifdef SDR_ISPOOLABLE
- SVX_DLLPRIVATE virtual int IsPoolable() const;
-#endif
};
#endif
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 8632703..2d84a5f 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -47,9 +47,6 @@ public:
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
virtual String GetValueTextByVal(BOOL bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 63d8a45..42b9450 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -49,9 +49,6 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const;
const Fraction& GetValue() const { return nValue; }
void SetValue(const Fraction& rVal) { nValue = rVal; }
-#ifdef SDR_ISPOOLABLE
- virtual int IsPoolable() const;
-#endif
};
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index e366934..f74a37c 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -345,13 +345,6 @@ SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
return pItem;
}
-#ifdef SDR_ISPOOLABLE
-int SdrCustomShapeGeometryItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
-}
-#endif
sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
return 1;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 2d27a35..7e20d8b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -698,14 +698,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
return new SdrFractionItem(Which(),GetValue());
}
-#ifdef SDR_ISPOOLABLE
-int SdrFractionItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// ScaleItem
////////////////////////////////////////////////////////////////////////////////
@@ -788,14 +780,6 @@ SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-int SdrOnOffItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
@@ -828,14 +812,6 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-int SdrYesNoItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
//------------------------------------------------------------
// class SdrPercentItem
//------------------------------------------------------------
@@ -871,14 +847,6 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-int SdrPercentItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
//------------------------------------------------------------
// class SdrAngleItem
//------------------------------------------------------------
@@ -968,14 +936,6 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-int SdrAngleItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
//------------------------------------------------------------
// class SdrMetricItem
//------------------------------------------------------------
@@ -1028,14 +988,6 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-int SdrMetricItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// Items des Legendenobjekts
////////////////////////////////////////////////////////////////////////////////
@@ -1505,13 +1457,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
SetValue( bValue );
return true;
}
-#ifdef SDR_ISPOOLABLE
-int SdrTextFixedCellHeightItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
-}
-#endif
TYPEINIT1_AUTOFACTORY( SdrCustomShapeAdjustmentItem, SfxPoolItem );
@@ -1615,14 +1560,6 @@ SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const
return pItem;
}
-#ifdef SDR_ISPOOLABLE
-int SdrCustomShapeAdjustmentItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal_uInt32 nIndex ) const
{
#ifdef DBG_UTIL
@@ -2171,15 +2108,6 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation(
return ePres;
}
-#ifdef SDR_ISPOOLABLE
-
-int SdrSignedPercentItem::IsPoolable() const
-{
- USHORT nId=Which();
- return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
-}
-#endif
-
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// SdrGrafRedItem
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
commit 426936b8030421533521e931fe0e322c4057defe
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:05:44 2011 +0100
Remove unused file (since 1995)
diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx
deleted file mode 100644
index f2b21b3..0000000
--- a/svx/inc/svdshort.hxx
+++ /dev/null
@@ -1,93 +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.
- *
- ************************************************************************/
-
-#error svdshort wird nicht mehr verwendet!
-
-#ifndef _SVDSHORT_HXX
-#define _SVDSHORT_HXX
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef Weg_Mit_Den_Doofen_Abkuerzungen
- // Statistik - Stand 02-03-1995
- // Haeufigkeit Ersparnis
-#define SdrHelpLineKind SdrFLK /* HL ist schon besetzt */
-#define SdrHelpLineList SdrFLL /* HL ist schon besetzt */
-#define SdrHelpLine SdrFL /* HL ist schon besetzt */
-#define SdrObjTransformInfoRec SdrTI
-#define SdrDragCrook SdrDC
-#define SdrDragMirror SdrDI
-#define SdrDragMovHdl SdrDH
-#define SdrDragResize SdrDZ
-#define SdrDragRotate SdrDR
-#define SdrDragShear SdrDE
-#define SdrDragMove SdrDM
-#define SdrCreateCmd SdrCC
-#define SdrUndoAttrObj SdrAU
-#define SdrObjKind SdrOK
-#define SdrUndoGroup SdrUG
-#define SdrUndoAction SdrUA
-#define SdrAttrObj SdrAO
-#define SdrGrafObj SdrGO
-#define SdrMarkList SdrML
-#define SdrHdlList SdrHL
-#define SdrLayerAdmin SdrLA
-#define SdrObjUserCall SdrUC
-#define SdrObjUnknown SdrUO
-#define SdrExchangeView SdrXV
-#define SdrCreateView SdrCV
-#define SdrOle2Obj SdrOO
-#define SdrObjGeoData SdrGD
-#define SdrDragView SdrDV
-#define SdrSnapView SdrSV
-#define SdrObjList SdrOL
-#define SdrEdgeObj SdrEO
-#define SdrCircObj SdrCO
-#define SdrObjGroup SdrOG
-#define SdrPage SdrPg
-#define SdrObjEditView SdrOV
-#define SdrModel SdrMD
-#define SdrEditView SdrEV
-#define SdrPaintView SdrNV
-#define SdrPolyObj SdrPO
-#define SdrRectObj SdrRO
-#define SdrTextObj SdrTO
-#define SdrMarkView SdrMV
-#define SdrPathObj SdrBO
-#define SdrPageView SdrPV
-#define SdrDragStat SdrDS
-#define SdrVirtObj SdrVO
-#define SdrObject SdrO
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif //_SVDSHORT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8290ca6749b0989b79bfa2e47cb8fb27033b3d81
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:04:28 2011 +0100
Move comment text from macro to comment
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index a5d107c..d649bd7 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -149,18 +149,16 @@ private:
public:
ContainerSorter(Container& rNewCont): rCont(rNewCont) {}
void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const;
-#ifdef This_Is_Just_For_A_Comment
- Compare() muss returnieren:
- -1 falls *pElem1<*pElem2
- 0 falls *pElem1=*pElem2
- +1 falls *pElem1>*pElem2
-#endif
+
+ // Compare() has to return:
+ // -1 if *pElem1<*pElem2
+ // 0 if *pElem1=*pElem2
+ // +1 if *pElem1>*pElem2
virtual int Compare(const void* pElem1, const void* pElem2) const=0;
private: // damit keiner vergessen wird
virtual
void
Is1stLessThan2nd(const void* pElem1, const void* pElem2) const;
-// virtual bool Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
commit 87c1d4daecb91016e489f2bd50021336531eb628
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 01:03:47 2011 +0100
Remove obviously unused documentation
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index fbac729..dfc3304 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1185,40 +1185,6 @@ typedef enum {
mso_colorBParamShift = 16 // To extract the parameter value
} MSO_SYSCOLORINDEX;
-#ifdef Hier_noch_was_aus_der_Doku
-/* The secondary, or data, UID - should always be set. */
-BYTE m_rgbUid[16];
-/* The primary UID - this defaults to 0, in which case the primary ID is
- that of the internal data. NOTE!: The primary UID is only saved to disk
- if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.inst and
- blip_signature is one of the values defined in MSO_BI */
-BYTE m_rgbUidPrimary[16]; // optional based on the above check
-
-/* Metafile Blip overhead = 34 bytes. m_cb gives the number of
- bytes required to store an uncompressed version of the file, m_cbSave
- is the compressed size. m_mfBounds gives the boundary of all the
- drawing calls within the metafile (this may just be the bounding box
- or it may allow some whitespace, for a WMF this comes from the
- SetWindowOrg and SetWindowExt records of the metafile). */
-int m_cb; // Cache of the metafile size
-RECT m_rcBounds; // Boundary of metafile drawing commands
-POINT m_ptSize; // Size of metafile in EMUs
-int m_cbSave; // Cache of saved size (size of m_pvBits)
-BYTE m_fCompression; // MSO_BLIPCOMPRESSION
-BYTE m_fFilter; // always mso_filterNone
-void *m_pvBits; // Compressed bits of metafile.
-
-/* The secondary, or data, UID - should always be set. */
-BYTE m_rgbUid[16];
-/* The primary UID - this defaults to 0, in which case the primary ID is
- that of the internal data. NOTE!: The primary UID is only saved to disk
- if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.finst and
- blip_signature is one of the values defined in MSO_BI*/
-BYTE m_rgbUidPrimary[16]; // optional based on the above check
-BYTE m_bTag;
-void *m_pvBits; // raster bits of the blip.
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit eabc7a754545cb21a1edf00fc660af3f73314e70
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:57:24 2011 +0100
Remove TEMPLATE_DIALOG_MORE_POLISHED
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index b0717a3..96d6cea 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -306,18 +306,6 @@ static gboolean display_menu_cb( GtkWidget *,
if (event->button == 2)
return FALSE;
-#ifdef TEMPLATE_DIALOG_MORE_POLISHED
- if (event->button == 1 &&
- event->type == GDK_2BUTTON_PRESS)
- {
- open_template_cb( NULL );
- return TRUE;
- }
- if (event->button == 3)
- {
- ... as below ...
-#endif
-
refresh_menu( pMenu );
gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
commit 2539646dd4ec19fc7396910d58aed6c11ccbcbcb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:56:25 2011 +0100
Remove TL_OUTDATED
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx
index 5853e81..731ff97 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/misc.hxx
@@ -147,14 +147,6 @@ BOOL IsReadOnly( const String &rURL, BOOL *pbExist = 0 );
// checks if a file with the given URL exists
BOOL FileExists( const String &rURL );
-#ifdef TL_OUTDATED
-// returns complete file URL for given filename that is to be searched in
-// the specified path
-String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName );
-
-String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim = TRUE );
-#endif
-
///////////////////////////////////////////////////////////////////////////
::rtl::OUString GetDictionaryWriteablePath();
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 52407f0..c352911 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -72,69 +72,6 @@ BOOL FileExists( const String &rMainURL )
return bExists;
}
-
-#ifdef TL_OUTDATED
-
-String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName )
-{
- String aURL;
- if (rFileName.Len())
- {
- INetURLObject aURLObj;
- aURLObj.SetSmartProtocol( INET_PROT_FILE );
- aURLObj.SetSmartURL( GetModulePath(ePath) );
- aURLObj.Append( rFileName );
- if (aURLObj.HasError())
- {
- DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL");
- }
- aURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
- }
- return aURL;
-}
-
-
-String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim )
-{
- String aRes;
-
- SvtPathOptions aPathOpt;
- switch (ePath)
- {
- case SvtPathOptions::PATH_MODULE :
- aRes = aPathOpt.GetModulePath();
- break;
- case SvtPathOptions::PATH_LINGUISTIC :
- {
- String aTmp( aPathOpt.GetLinguisticPath() );
- utl::LocalFileHelper::ConvertURLToPhysicalName( aTmp, aRes );
- break;
- }
-/*
- case SvtPathOptions::PATH_USERDICTIONARY :
- {
- String aTmp( aPathOpt.GetUserDictionaryPath() );
- utl::LocalFileHelper::ConvertURLToPhysicalName( aTmp, aRes );
- break;
- }
-*/
- default:
- DBG_ASSERT( 0, "unexpected argument (path)" );
- }
- if (bAddAccessDelim && aRes.Len())
- {
-#ifdef WNT
- aRes += '\\';
-#else
- aRes += '/';
-#endif
- }
-
- return aRes;
-}
-
-#endif
-
///////////////////////////////////////////////////////////////////////////
rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar )
commit ca624c44151ab4cce759190d776f80680f4c0023
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:54:31 2011 +0100
Remove EDIT_PRINTER_LOG
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 055e815..85b5d17 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -305,22 +305,6 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
sal_Bool bMetafile = pOutDev->GetConnectMetaFile() ? sal_True : sal_False;
Region aOldRegion = pOutDev->GetClipRegion();
-#ifdef EDIT_PRINTER_LOG
- if ( pOutDev->GetOutDevType() == OUTDEV_PRINTER )
- {
- SvFileStream aLog( "d:\\editprn.log", STREAM_WRITE );
- aLog.Seek( STREAM_SEEK_TO_END );
- aLog << ' ' << endl << "Printing: ";
- aLog << GetText( "\n\r" ).GetStr();
- aLog << endl << endl;
- aLog << "Ref-Device: " << String( (sal_uInt32)GetRefDevice() ).GetStr() << " Type=" << String( (sal_uInt16)GetRefDevice()->GetOutDevType() ).GetStr() << ", MapX=" << String( GetRefDevice()->GetMapMode().GetScaleX().GetNumerator() ).GetStr() << "/" << String( GetRefDevice()->GetMapMode().GetScaleX().GetDenominator() ).GetStr() <<endl;
- aLog << "Paper-Width: " << String( GetPaperSize().Width() ).GetStr() << ",\tOut-Width: " << String( rOutRect.GetWidth() ).GetStr() << ",\tCalculated: " << String( CalcTextWidth() ).GetStr() << endl;
- aLog << "Paper-Height: " << String( GetPaperSize().Height() ).GetStr() << ",\tOut-Height: " << String( rOutRect.GetHeight() ).GetStr() << ",\tCalculated: " << String( GetTextHeight() ).GetStr() << endl;
-
- aLog << endl;
- }
-#endif
-
// Wenn es eine gab => Schnittmenge !
// Bei der Metafileaufzeichnung Push/Pop verwenden.
if ( bMetafile )
@@ -926,17 +910,6 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
{
EditDbg::ShowEditEngineData( this );
- #ifdef EDIT_PRINTER_LOG
- SvFileStream aLog( "d:\\editprn.log", STREAM_WRITE );
- aLog.Seek( STREAM_SEEK_TO_END );
- aLog << ' ' << endl << "Debug: ";
- aLog << GetText( "\n\r" ).GetStr();
- aLog << endl << endl;
- aLog << "Ref-Device: " << String( (sal_uInt32)GetRefDevice() ).GetStr() << " Type=" << String( (sal_uInt16)GetRefDevice()->GetOutDevType() ).GetStr() << ", MapX=" << String( GetRefDevice()->GetMapMode().GetScaleX().GetNumerator() ).GetStr() << "/" << String( GetRefDevice()->GetMapMode().GetScaleX().GetDenominator() ).GetStr() <<endl;
- aLog << "Paper-Width: " << String( GetPaperSize().Width() ).GetStr() << ",\tCalculated: " << String( CalcTextWidth() ).GetStr() << endl;
- aLog << "Paper-Height: " << String( GetPaperSize().Height() ).GetStr() << ",\tCalculated: " << String( GetTextHeight() ).GetStr() << endl;
- aLog << endl;
- #endif
}
bDone = FALSE;
}
commit ef957c252e4e8e2005c11e8f419ff5e24fec34ea
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:53:24 2011 +0100
Remove OLD_NUMBER_FORMATTING
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 9489f6a..c3cf1cf 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -657,40 +657,6 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
}
return sRet;
}
-#ifdef OLD_NUMBER_FORMATTING
-void SvxNumberFormat::GetCharStr( ULONG nNo, String& rStr ) const
-{
- DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
-
- const ULONG coDiff = 'Z' - 'A' +1;
- char cAdd = (SVX_NUM_CHARS_UPPER_LETTER == eNumType ? 'A' : 'a') - 1;
- ULONG nCalc;
-
- do {
- nCalc = nNo % coDiff;
- if( !nCalc )
- nCalc = coDiff;
- rStr.Insert( sal_Unicode(cAdd + nCalc ), 0 );
- nNo -= nCalc;
- if( nNo )
- nNo /= coDiff;
- } while( nNo );
-}
-
-void SvxNumberFormat::GetCharStrN( ULONG nNo, String& rStr ) const
-{
- DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
-
- const ULONG coDiff = 'Z' - 'A' +1;
- char cChar = (char)(--nNo % coDiff);
- if( SVX_NUM_CHARS_UPPER_LETTER_N == eNumType )
- cChar += 'A';
- else
- cChar += 'a';
-
- rStr.Fill( (USHORT)(nNo / coDiff) + 1, sal_Unicode(cChar) );
-}
-#endif //OLD_NUMBER_FORMATTING
const String& SvxNumberFormat::GetCharFmtName()const
{
commit 75bc62d199115f49c0c4dd487b6ee9193f331a23
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:52:14 2011 +0100
Remove unused USED ;)
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 8a0414b..738ab63 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -494,19 +494,9 @@ sal_Bool SvxSpellWrapper::SpellNext( )
// Ein BODY_Bereich erledigt, Frage nach dem anderen BODY_Bereich
WAIT_OFF();
-// Sobald im Dialog das DontWrapAround gesetzt werden kann, kann der
-// folgende #ifdef-Zweig aktiviert werden ...
-#ifdef USED
- sal_Bool bDontWrapAround = IsHyphen() ?
- pSpell->GetOptions() & DONT_WRAPAROUND :
- pSpell->GetHyphOptions() & HYPH_DONT_WRAPAROUND;
- if( bDontWrapAround )
-#else
sal_uInt16 nResId = bReverse ? RID_SVXQB_BW_CONTINUE : RID_SVXQB_CONTINUE;
QueryBox aBox( pWin, EditResId( nResId ) );
if ( aBox.Execute() != RET_YES )
-#endif
-
{
// Verzicht auf den anderen Bereich, ggf. Frage nach Sonderbereich
WAIT_ON();
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 5bd1f0c..5d1a1b1 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1144,18 +1144,6 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & )
{
}
-#ifdef USED
-void SvxRTFParser::SaveState( int nToken )
-{
- SvRTFParser::SaveState( nToken );
-}
-
-void SvxRTFParser::RestoreState()
-{
- SvRTFParser::RestoreState();
-}
-#endif
-
void SvxRTFParser::BuildWhichTbl()
{
if( aWhichMap.Count() )
commit 8e33863bca7d79846a3647e046f655b53ec5cabe
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:48:10 2011 +0100
Remove HP9000
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index e299717..8b1794b 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -598,13 +598,6 @@ void SbiDisas::OffOp( String& rText )
}
// Data type
-#ifdef HP9000 // TODO: remove this!
-static char* SbiDisas_TypeOp_pTypes[13] = {
- "Empty","Null","Integer","Long","Single","Double",
- "Currency","Date","String","Object","Error","Boolean",
- "Variant" };
-#define pTypes SbiDisas_TypeOp_pTypes
-#endif
void SbiDisas::TypeOp( String& rText )
{
// From 1996-01-19: type can contain flag for BYVAL (StepARGTYP)
@@ -615,12 +608,6 @@ void SbiDisas::TypeOp( String& rText )
}
if( nOp1 < 13 )
{
-#ifndef HP9000
- static char pTypes[][13] = {
- "Empty","Null","Integer","Long","Single","Double",
- "Currency","Date","String","Object","Error","Boolean",
- "Variant" };
-#endif
rText.AppendAscii( pTypes[ nOp1 ] );
}
else
@@ -629,9 +616,6 @@ void SbiDisas::TypeOp( String& rText )
rText += (USHORT)nOp1;
}
}
-#ifdef HP9000
-#undef pTypes
-#endif
// TRUE-Label, condition Opcode
void SbiDisas::CaseOp( String& rText )
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index c131598..66172a1 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -39,7 +39,7 @@
// class XOBitmap
//---------------
-#if defined HP9000 || defined SINIX
+#if defined SINIX
static Size aXOBitmapDefaultSize( 8, 8 );
#endif
@@ -59,7 +59,7 @@ public:
XOBitmap();
XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
-#if defined HP9000 || defined SINIX
+#if defined SINIX
XOBitmap( const USHORT* pArray, const Color& aPixelColor,
const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize,
XBitmapStyle eStyle = XBITMAP_TILE );
commit 4cfd48b9819b1dc4d89a80db8f927b197aafff41
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:44:03 2011 +0100
Remove TL_DEBUG
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 5abcb49..13b3aed 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1256,23 +1256,6 @@ namespace accessibility
const beans::PropertyValue &rRunAttrib = pRunAttrib[k];
aPropHashMap[ rRunAttrib.Name ] = rRunAttrib.Value; //!! should not only be the value !!
}
-#ifdef TL_DEBUG
- {
- uno::Sequence< rtl::OUString > aNames(1);
- aNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
- const rtl::OUString *pNames = aNames.getConstArray();
- const uno::Sequence< beans::PropertyValue > aAttribs( getRunAttributes( nIndex, aNames ) );
- const beans::PropertyValue *pAttribs = aAttribs.getConstArray();
- double d1 = -1.0;
- float f1 = -1.0;
- if (aAttribs.getLength())
- {
- uno::Any aAny( pAttribs[0].Value );
- aAny >>= d1;
- aAny >>= f1;
- }
- }
-#endif
// get resulting sequence
uno::Sequence< beans::PropertyValue > aRes;
commit 8c9d1ef4dd2d25b29ed3be0ea1439e2dedf8d770
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:43:17 2011 +0100
Remove unused DEBUG_JP
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index d7a3070..b36b990 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -41,38 +41,6 @@
using namespace ::rtl;
-#ifndef DBG_UTIL
-#undef DEBUG_JP
-#endif
-
-#ifdef DEBUG_JP
-
-#include <tools/fsys.hxx>
-
-class GrfWindow : public WorkWindow
-{
- Graphic aGrf;
-public:
- GrfWindow( const Graphic& rGrf );
- virtual void Paint( const Rectangle& rRect );
-};
-
-GrfWindow::GrfWindow( const Graphic& rGrf )
- : WorkWindow( NULL ),
- aGrf( rGrf )
-{
- SetPosSizePixel( Point( 100, 0 ), Size( 300, 300 ));
- Show();
- Invalidate();
- Update();
-}
-
-void GrfWindow::Paint( const Rectangle& )
-{
- aGrf.Draw( this, Point(0,0), GetSizePixel() );
-}
-#endif
-
static BYTE aPal1[ 2 * 4 ] = {
0x00, 0x00, 0x00, 0x00, // Schwarz
0xFF, 0xFF, 0xFF, 0x00 // Weiss
@@ -570,10 +538,6 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
default:
break;
}
-
-#ifdef DEBUG_JP
- new GrfWindow( rGrf );
-#endif
}
SetSrcEncoding( eOldEnc );
commit 2593ab7d4bd44966e176ab0e60c94ce49c62a2db
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 00:38:46 2011 +0100
Remove unused YURI_DARIO
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 4055bce..ce44969 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -262,11 +262,6 @@ IMPL_LINK( AboutDialog, TimerHdl, Timer *, pTimer )
IMPL_LINK( AboutDialog, AccelSelectHdl, Accelerator *, pAccelerator )
{
-#ifdef YURI_DARIO
- aCopyrightText.SetHelpText( DEFINE_CONST_UNICODE("Conoscere qualcuno ovunque egli sia, con cui comprendersi nonostante le distanze\n"
- "e le differenze, puo' trasformare la terra in un giardino. baci Valeria") );
-#endif
-
(void)pAccelerator; //unused
// init Timer
aTimer.SetTimeoutHdl( LINK( this, AboutDialog, TimerHdl ) );
More information about the Libreoffice-commits
mailing list