[Libreoffice-commits] .: 11 commits - basegfx/source cpputools/source formula/source regexp/inc regexp/source sal/cpprt sal/qa sc/source stoc/source sw/source tools/inc tools/Library_tl.mk tools/source tools/workben ucbhelper/inc ucbhelper/source ucb/workben unodevtools/inc unodevtools/source unotools/source vcl/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Fri Jan 20 03:18:26 PST 2012
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 5
cpputools/source/unoexe/unoexe.cxx | 16
formula/source/core/api/token.cxx | 11
regexp/inc/regexp/reclass.hxx | 2
regexp/source/reclass.cxx | 4
sal/cpprt/operators_new_delete.cxx | 10
sal/qa/osl/file/osl_File.cxx | 8
sal/qa/osl/file/test_cpy_wrt_file.cxx | 12
sc/source/core/data/cell.cxx | 13
sc/source/core/data/cell2.cxx | 3
sc/source/core/data/table3.cxx | 3
sc/source/core/tool/chgtrack.cxx | 11
sc/source/core/tool/interpr1.cxx | 4
sc/source/core/tool/token.cxx | 11
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xetable.cxx | 12
sc/source/filter/excel/xistyle.cxx | 2
stoc/source/invocation_adapterfactory/iafactory.cxx | 12
sw/source/core/bastyp/swtypes.cxx | 56 +--
sw/source/core/crsr/unocrsr.cxx | 2
sw/source/core/layout/atrfrm.cxx | 6
sw/source/core/text/txtinit.cxx | 10
tools/Library_tl.mk | 1
tools/inc/tools/debug.hxx | 14
tools/inc/tools/mempool.hxx | 21 -
tools/source/debug/stcktree.cxx | 321 ------------------
tools/source/memtools/mempool.cxx | 3
tools/source/reversemap/bestreversemap.cxx | 2
tools/workben/mempooltest.cxx | 2
ucb/workben/ucb/ucbdemo.cxx | 2
ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx | 8
ucbhelper/source/client/fileidentifierconverter.cxx | 4
unodevtools/inc/unodevtools/options.hxx | 4
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 12
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 9
unodevtools/source/skeletonmaker/javatypemaker.cxx | 2
unodevtools/source/skeletonmaker/skeletoncpp.hxx | 3
unodevtools/source/skeletonmaker/skeletonjava.hxx | 5
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 12
unodevtools/source/unodevtools/options.cxx | 6
unotools/source/ucbhelper/localfilehelper.cxx | 4
vcl/source/app/svapp.cxx | 4
42 files changed, 127 insertions(+), 527 deletions(-)
New commits:
commit 4eba18ae5f0d854a66ff556ce308308ef46341e8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 12:07:11 2012 +0100
Code clean up.
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index d937724..4393ee3 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -76,7 +76,7 @@ struct Encoder
};
-int main(int, char**)
+int main()
{
# define EXP(x) Encoder(x, #x)
commit 0a77071485b611702c66182365016226591d0a29
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 12:04:54 2012 +0100
Code clean up.
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 39c713a..ff075d4 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -157,10 +157,10 @@ struct AdapterImpl
// XInvocation calls
void getValue(
const typelib_TypeDescription * pMemberType,
- void * pReturn, void * pArgs[], uno_Any ** ppException );
+ void * pReturn, uno_Any ** ppException );
void setValue(
const typelib_TypeDescription * pMemberType,
- void * pReturn, void * pArgs[], uno_Any ** ppException );
+ void * pArgs[], uno_Any ** ppException );
void invoke(
const typelib_TypeDescription * pMemberType,
void * pReturn, void * pArgs[], uno_Any ** ppException );
@@ -380,7 +380,7 @@ static void handleInvokExc( uno_Any * pDest, uno_Any * pSource )
//______________________________________________________________________________
void AdapterImpl::getValue(
const typelib_TypeDescription * pMemberType,
- void * pReturn, void * [], uno_Any ** ppException )
+ void * pReturn, uno_Any ** ppException )
{
uno_Any aInvokRet;
void * pInvokArgs[1];
@@ -415,7 +415,7 @@ void AdapterImpl::getValue(
//______________________________________________________________________________
void AdapterImpl::setValue(
const typelib_TypeDescription * pMemberType,
- void *, void * pArgs[], uno_Any ** ppException )
+ void * pArgs[], uno_Any ** ppException )
{
uno_Any aInvokVal;
::uno_type_any_construct(
@@ -647,9 +647,9 @@ static void SAL_CALL adapter_dispatch(
else // attribute
{
if (pReturn)
- that->getValue( pMemberType, pReturn, pArgs, ppException );
+ that->getValue( pMemberType, pReturn, ppException );
else
- that->setValue( pMemberType, pReturn, pArgs, ppException );
+ that->setValue( pMemberType, pArgs, ppException );
}
}
}
commit d92ac0dfbf5fd5a82176feb43d471f10a12e889b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 12:02:50 2012 +0100
Remove obsolete suppressOslDebugMessage.
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 02ca76f..4d0f4af 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5098,11 +5098,6 @@ namespace osl_DirectoryItem
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" );
}// namespace osl_DirectoryItem
-//Use to deliberately silence warnings for a deliberate error
-extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
-{
-}
-
//------------------------------------------------------------------------
// Beginning of the test cases for Directory class
//------------------------------------------------------------------------
@@ -5582,10 +5577,7 @@ namespace osl_Directory
void getNextItem_002( )
{
::osl::Directory testDirectory( aTmpName3 ); //constructor
- //deliberate error, suppress run-time warning
- pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc = osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage );
nError1 = testDirectory.getNextItem( rItem );
- osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrive an item in a directory which is not opened, also test for nHint's default value.",
( ::osl::FileBase::E_INVAL == nError1 ) );
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 161f0a4..1e40405 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -46,11 +46,6 @@ using ::rtl::OUString;
using ::rtl::OUStringToOString;
using ::rtl::OString;
-//Use to silence OSL_ warnings for a deliberate error
-extern "C" void SAL_CALL suppressOslDebugMessage2( const sal_Char *, sal_Int32, const sal_Char * )
-{
-}
-
class test_osl_writeFile : public CppUnit::TestFixture
{
public:
@@ -72,11 +67,6 @@ public:
sErrorMsg += "' would exist!";
CPPUNIT_ASSERT_MESSAGE(sErrorMsg.getStr(), err == FileBase::E_EXIST);
- //deliberate errors, suppress run-time warning for operations on
- //un-opened File
- pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc =
- osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage2 );
-
char buffer[1];
sal_uInt64 written = 0;
err = tmp_file.write((void*)buffer, sizeof(buffer), written);
@@ -88,8 +78,6 @@ public:
err = tmp_file.close();
CPPUNIT_ASSERT_MESSAGE("close on unconnected file should fail", err != FileBase::E_None);
- osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
-
err = ::osl::File::remove(aTmpFile);
CPPUNIT_ASSERT_MESSAGE("temp file should have existed", err == FileBase::E_None);
}
commit 46ce4f561dafeaab614e83653cba646885e8fd17
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 12:00:33 2012 +0100
Code clean up.
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index e07d2ec..9561a89 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -49,8 +49,6 @@
#include <osl/diagnose.h>
#include <rtl/alloc.h>
-using std::nothrow_t;
-
// =======================================================================
// AllocatorTraits
// =======================================================================
@@ -158,8 +156,8 @@ static void* allocate (
// =======================================================================
-static void* allocate (
- std::size_t n, AllocatorTraits const & rTraits, std::nothrow_t const &)
+static void* allocate_nothrow (
+ std::size_t n, AllocatorTraits const & rTraits)
SAL_THROW(())
{
try
@@ -205,7 +203,7 @@ void SAL_CALL operator delete (void * p) throw ()
void* SAL_CALL operator new (std::size_t n, std::nothrow_t const &) throw ()
{
- return allocate (n, ScalarTraits(), nothrow_t());
+ return allocate_nothrow (n, ScalarTraits());
}
// =======================================================================
@@ -237,7 +235,7 @@ void SAL_CALL operator delete[] (void * p) throw ()
void* SAL_CALL operator new[] (std::size_t n, std::nothrow_t const &) throw ()
{
- return allocate (n, VectorTraits(), nothrow_t());
+ return allocate_nothrow (n, VectorTraits());
}
// =======================================================================
commit ce2147ec43c8116c801e9a83f81eea188c2a719e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:58:40 2012 +0100
Code clean up.
diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx
index 4cb2819..cc9bf1d 100644
--- a/regexp/inc/regexp/reclass.hxx
+++ b/regexp/inc/regexp/reclass.hxx
@@ -364,7 +364,7 @@ class REGEXP_DLLPUBLIC Regexpr
sal_Int32 arg2, sal_Unicode *end);
sal_Bool at_begline_loc_p(const sal_Unicode *local_pattern,
const sal_Unicode *p);
- sal_Bool at_endline_loc_p(const sal_Unicode *p, const sal_Unicode *pend);
+ sal_Bool at_endline_loc_p(const sal_Unicode *p);
reg_errcode_t compile_range(sal_Unicode range_begin, sal_Unicode range_end, sal_Unicode *b);
sal_Bool group_in_compile_stack(compile_stack_type compile_stack,
sal_uInt32 regnum);
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index 7e051fa..8fdadef 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -688,7 +688,7 @@ Regexpr::at_begline_loc_p(const sal_Unicode *local_pattern, const sal_Unicode *p
at least one character after the $, i.e., `P < PEND'. */
sal_Bool
-Regexpr::at_endline_loc_p(const sal_Unicode *p, const sal_Unicode * /* pend */ )
+Regexpr::at_endline_loc_p(const sal_Unicode *p)
{
const sal_Unicode *next = p;
//sal_Bool next_backslash = *next == (sal_Unicode)'\\';
@@ -993,7 +993,7 @@ Regexpr::regex_compile()
if ( /* If at end of pattern, it's an operator. */
p == pend
/* Otherwise, depends on what's next. */
- || at_endline_loc_p(p, pend)) {
+ || at_endline_loc_p(p)) {
BUF_PUSH(endline);
} else {
goto normal_char;
commit b2ceee71bafac15c0401893f0475cbcf4164a9f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:55:10 2012 +0100
Code clean up.
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 863adf5..590b8db 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -80,8 +80,7 @@ namespace basegfx
bool lcl_getDoubleChar(double& o_fRetval,
sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 /*nLen*/)
+ const ::rtl::OUString& rStr)
{
sal_Unicode aChar( rStr[io_rPos] );
::rtl::OUStringBuffer sNumberString;
@@ -136,7 +135,7 @@ namespace basegfx
const ::rtl::OUString& rStr,
const sal_Int32 nLen )
{
- if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr, nLen) )
+ if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr) )
return false;
lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
commit b149b0433d28b89b187f04455bcb242b8b17a48c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:53:46 2012 +0100
ucbhelper::GetLocalFileURL does not use its arg.
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 7ebc94a..0a61f75 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -2346,7 +2346,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
DBG_ASSERT(xManager.is(),
"MyWin::ToolBarHandler(): Service lacks interface");
- rtl::OUString aURL(getLocalFileURL(xManager));
+ rtl::OUString aURL(getLocalFileURL());
String aText(RTL_CONSTASCII_USTRINGPARAM("Local file URL: "));
aText += String(aURL);
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index 14bfb17..262d32a 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
@@ -48,17 +48,11 @@ namespace ucbhelper {
The result can be used as the rBaseURL parameter of
ucb::getFileURLFromSystemPath().
- @param rManager
- A content provider manager. Must not be null.
-
@returns
either a 'root' URL for the most 'local' file content provider, or an
empty string, if no such URL can meaningfully be constructed.
*/
-UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL(
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentProviderManager > const &
- rManager)
+UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL()
SAL_THROW((com::sun::star::uno::RuntimeException));
//============================================================================
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index a4428e5..1abfedd 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -47,9 +47,7 @@ namespace ucbhelper {
//============================================================================
rtl::OUString
-getLocalFileURL(
- uno::Reference< ucb::XContentProviderManager > const &)
- SAL_THROW((uno::RuntimeException))
+getLocalFileURL() SAL_THROW((uno::RuntimeException))
{
// If there were more file systems than just "file:///" (e.g., the obsolete
// "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 2d28dac..caa19f5 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -117,7 +117,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::
try
{
- rtl::OUString aBase( ::ucbhelper::getLocalFileURL( xManager ) );
+ rtl::OUString aBase( ::ucbhelper::getLocalFileURL() );
rReturn = ::ucbhelper::getFileURLFromSystemPath( xManager, aBase, rName );
}
catch (const ::com::sun::star::uno::RuntimeException&)
@@ -145,7 +145,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::
try
{
INetURLObject aObj( rName );
- INetURLObject aLocal( ::ucbhelper::getLocalFileURL( xManager ) );
+ INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
if ( aObj.GetProtocol() == aLocal.GetProtocol() )
rReturn = ::ucbhelper::getSystemPathFromFileURL( xManager, rName );
}
commit 6cd581f240f9be985e92365f9da0c919142005b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:51:36 2012 +0100
Code clean up.
diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx
index f1fc70b..da7a06b 100644
--- a/unodevtools/inc/unodevtools/options.hxx
+++ b/unodevtools/inc/unodevtools/options.hxx
@@ -39,12 +39,12 @@ namespace unodevtools {
//-------------------------------------------------------------------------------
sal_Bool readOption( rtl::OUString * pValue, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const rtl::OUString & aArg)
+ sal_uInt32 * pnIndex, const rtl::OUString & aArg)
throw (com::sun::star::uno::RuntimeException);
//-------------------------------------------------------------------------------
sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const rtl::OUString & aArg);
+ sal_uInt32 * pnIndex, const rtl::OUString & aArg);
} // end of namespace unodevtools
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 57b4613..82987cc 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -41,7 +41,6 @@ namespace skeletonmaker { namespace cpp {
void generateIncludes(std::ostream & o,
const boost::unordered_set< OString, OStringHash >& interfaces,
- const AttributeInfo& /*properties*/,
OString propertyhelper, bool serviceobject,
bool supportxcomponent)
{
@@ -968,8 +967,7 @@ void generateQueryInterface(std::ostream& o,
void generateSkeleton(ProgramOptions const & options,
TypeManager const & manager,
- std::vector< OString > const & types,
- OString const & /*delegate*/)
+ std::vector< OString > const & types)
{
// special handling of calc add-ins
if (options.componenttype == 2) {
@@ -1030,8 +1028,8 @@ void generateSkeleton(ProgramOptions const & options,
printLicenseHeader(*pofs, compFileName);
}
- generateIncludes(*pofs, interfaces, properties, propertyhelper,
- serviceobject, supportxcomponent);
+ generateIncludes(*pofs, interfaces, propertyhelper, serviceobject,
+ supportxcomponent);
if (options.componenttype == 3) {
*pofs << "#include \"com/sun/star/frame/XFrame.hpp\"\n";
@@ -1192,8 +1190,8 @@ void generateCalcAddin(ProgramOptions const & options,
printLicenseHeader(*pofs, compFileName);
}
- generateIncludes(*pofs, interfaces, properties, propertyhelper,
- serviceobject, supportxcomponent);
+ generateIncludes(*pofs, interfaces, propertyhelper, serviceobject,
+ supportxcomponent);
*pofs <<
"#include \"com/sun/star/beans/PropertyValue.hpp\"\n"
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 5b5a86c..63bbd39 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -47,7 +47,6 @@ void generatePackage(std::ostream & o, const OString & implname)
}
void generateImports(std::ostream & o, ProgramOptions const & options,
- const boost::unordered_set< OString, OStringHash >& /*interfaces*/,
const OString & propertyhelper,
bool serviceobject, bool supportxcomponent)
{
@@ -265,7 +264,6 @@ bool checkAttribute(OStringBuffer& attributeValue, sal_uInt16 attribute)
}
void registerProperties(std::ostream& o,
- TypeManager const & /*manager*/,
const AttributeInfo& properties,
const OString& indentation)
{
@@ -837,7 +835,7 @@ void generateClassDefinition(std::ostream& o,
o << "\n public " << classname << "( XComponentContext context )\n"
" {\n m_xContext = context;\n";
if (propertyhelper.equals("_")) {
- registerProperties(o, manager, properties, " ");
+ registerProperties(o, properties, " ");
} else {
if (propertyhelper.getLength() > 1) {
o << propcomment
@@ -862,8 +860,7 @@ void generateClassDefinition(std::ostream& o,
void generateSkeleton(ProgramOptions const & options,
TypeManager const & manager,
- std::vector< OString > const & types,
- OString const & /*delegate*/)
+ std::vector< OString > const & types)
{
boost::unordered_set< OString, OStringHash > interfaces;
boost::unordered_set< OString, OStringHash > services;
@@ -958,7 +955,7 @@ void generateSkeleton(ProgramOptions const & options,
generatePackage(*pofs, options.implname);
- generateImports(*pofs, options, interfaces, propertyhelper,
+ generateImports(*pofs, options, propertyhelper,
serviceobject, supportxcomponent);
OString classname(options.implname);
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index 6a192ae..51b52e5 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -203,7 +203,7 @@ void printConstructor(std::ostream & o,
void printMethodParameters(std::ostream & o,
ProgramOptions const & options, TypeManager const & manager,
typereg::Reader const & reader, sal_uInt16 method, bool previous,
- bool withtype, bool /*shortname*/)
+ bool withtype)
{
for ( sal_uInt16 i = 0; i < reader.getMethodParameterCount(method); ++i ) {
if ( previous )
diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
index 803788c..fed82e4 100644
--- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
@@ -130,8 +130,7 @@ void generateDocumentation(std::ostream & o,
void generateSkeleton(ProgramOptions const & options,
TypeManager const & manager,
- std::vector< rtl::OString > const & types,
- rtl::OString const & delegate);
+ std::vector< rtl::OString > const & types);
void generateCalcAddin(ProgramOptions const & options,
TypeManager const & manager,
diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx
index e2c0c9e..d4dfc07 100644
--- a/unodevtools/source/skeletonmaker/skeletonjava.hxx
+++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx
@@ -64,8 +64,7 @@ void printMethodParameters(std::ostream & o,
TypeManager const & manager,
typereg::Reader const & reader,
sal_uInt16 method, bool previous,
- bool withtype,
- bool shortname=false);
+ bool withtype);
void printExceptionSpecification(std::ostream & o,
ProgramOptions const & options,
@@ -109,7 +108,7 @@ void generateDocumentation(std::ostream & o,
rtl::OString const & type,
rtl::OString const & delegate);
-void generateSkeleton(ProgramOptions const & options, TypeManager const & manager, std::vector< rtl::OString > const & types, rtl::OString const & delegate);
+void generateSkeleton(ProgramOptions const & options, TypeManager const & manager, std::vector< rtl::OString > const & types);
} }
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index 119b778..456f7b2 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -141,12 +141,13 @@ void printUsageAndExit(const char* programname, const char* version)
}
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
+SAL_IMPLEMENT_MAIN()
{
const char* version = "0.4";
const char* programname = "uno-skeletonmaker";
- if ( argc <= 1 ) {
+ sal_uInt32 nCount = rtl_getAppCommandArgCount();
+ if ( nCount == 0 ) {
printUsageAndExit(programname, version);
exit(EXIT_FAILURE);
}
@@ -158,8 +159,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
try {
- sal_Int32 nPos = 0;
- sal_Int32 nCount = (sal_Int32)rtl_getAppCommandArgCount();
+ sal_uInt32 nPos = 0;
OUString arg, sOption;
sal_Bool bOption=sal_False;
@@ -327,10 +327,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
switch ( options.language )
{
case 1: //Java
- java::generateSkeleton(options, manager, types, delegate);
+ java::generateSkeleton(options, manager, types);
break;
case 2: //C++
- cpp::generateSkeleton(options, manager, types, delegate);
+ cpp::generateSkeleton(options, manager, types);
break;
default:
OSL_ASSERT(false);
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index dbca5cb..776c882 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -49,7 +49,7 @@ static void out( const sal_Char * pText )
//-------------------------------------------------------------------------------
sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const OUString & aArg)
+ sal_uInt32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
const OUString dash = OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
@@ -66,7 +66,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
++(*pnIndex);
rtl_getAppCommandArg(*pnIndex, &pValue->pData);
- if (*pnIndex >= (sal_Int32)rtl_getAppCommandArgCount() ||
+ if (*pnIndex >= rtl_getAppCommandArgCount() ||
pValue->copy(1).equals(dash))
{
OUStringBuffer buf( 32 );
@@ -103,7 +103,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
//-------------------------------------------------------------------------------
sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const OUString & aArg)
+ sal_uInt32 * pnIndex, const OUString & aArg)
{
const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
commit b855cd62f626858efae5c7a5cd4911f7afb4b06c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:49:53 2012 +0100
Code clean up.
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index ea3eac5..a3ea100 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -160,7 +160,7 @@ static const char arUsingText[] =
//--------------------------------------------------------------------------------------------------
static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const OUString & aArg)
+ sal_uInt32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
@@ -178,7 +178,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
++(*pnIndex);
rtl_getAppCommandArg(*pnIndex, &pValue->pData);
- if (*pnIndex >= (sal_Int32)rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash))
+ if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash))
{
OUStringBuffer buf( 32 );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("incomplete option \"-") );
@@ -217,7 +217,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
}
//--------------------------------------------------------------------------------------------------
static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
- sal_Int32 * pnIndex, const OUString & aArg)
+ sal_uInt32 * pnIndex, const OUString & aArg)
{
const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
OUString aOpt = OUString::createFromAscii(pOpt);
@@ -610,9 +610,10 @@ void ODisposingListener::waitFor( const Reference< XComponent > & xComp )
using namespace unoexe;
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
+SAL_IMPLEMENT_MAIN()
{
- if (argc <= 1)
+ sal_uInt32 nCount = rtl_getAppCommandArgCount();
+ if (nCount == 0)
{
out( arUsingText );
return 0;
@@ -636,8 +637,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
bool bNewRegistryMimic = false;
OUString aReadWriteRegistry;
- sal_Int32 nPos = 0;
- sal_Int32 nCount = (sal_Int32)rtl_getAppCommandArgCount();
+ sal_uInt32 nPos = 0;
// read up to arguments
while (nPos < nCount)
{
@@ -728,7 +728,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
aParams.realloc( nCount - nPos );
OUString * pParams = aParams.getArray();
- sal_Int32 nOffset = nPos;
+ sal_uInt32 nOffset = nPos;
for ( ; nPos < nCount; ++nPos )
{
if (rtl_getAppCommandArg( nPos, &pParams[nPos -nOffset].pData )
commit 9807566e12120f75f30394a57a86e0eb917243b9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:44:15 2012 +0100
Mempool size args are unused.
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index ca0186e..3a4f632 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -45,19 +45,16 @@ namespace formula
using namespace com::sun::star;
// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch
// SubCode via FormulaTokenIterator Push/Pop moeglich
-IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator )
// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
// Need a lot of FormulaDoubleToken
-const sal_uInt16 nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken, nMemPoolDoubleToken, nMemPoolDoubleToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
// Need a lot of FormulaByteToken
-const sal_uInt16 nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken, nMemPoolByteToken, nMemPoolByteToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
// Need several FormulaStringToken
-const sal_uInt16 nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken, nMemPoolStringToken, nMemPoolStringToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
// --- helpers --------------------------------------------------------------
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 155f4bd..2f3df26 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -71,15 +71,10 @@ const sal_uInt16 MAXRECURSION = 400;
// STATIC DATA -----------------------------------------------------------
#ifdef USE_MEMPOOL
-// MemPools auf 4k Boundaries - 64 Bytes ausrichten
-const sal_uInt16 nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
-const sal_uInt16 nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
-const sal_uInt16 nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
-const sal_uInt16 nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell, nMemPoolValueCell, nMemPoolValueCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell, nMemPoolStringCell, nMemPoolStringCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell )
#endif
// ============================================================================
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index e06d466..117d31d 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -59,8 +59,7 @@ using namespace formula;
// STATIC DATA -----------------------------------------------------------
#ifdef USE_MEMPOOL
-const sal_uInt16 nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell, nMemPoolEditCell, nMemPoolEditCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell )
#endif
// ============================================================================
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5525888..550d610 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -211,8 +211,7 @@ struct ScSortInfo
SCCOLROW nOrg;
DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
};
-const sal_uInt16 nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo )
// END OF STATIC DATA -----------------------------------------------------
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index d38d0ce..fb70fef 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -55,11 +55,9 @@
#define SC_CHGTRACK_CXX
#include "chgtrack.hxx"
-const sal_uInt16 nMemPoolChangeActionCellListEntry = (0x2000 - 64) / sizeof(ScChangeActionCellListEntry);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry, nMemPoolChangeActionCellListEntry, nMemPoolChangeActionCellListEntry )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry )
-const sal_uInt16 nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActionLinkEntry);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
// loaded MSB > eigenes => inkompatibel
#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
@@ -1252,8 +1250,7 @@ sal_Bool ScChangeActionMove::Reject( ScDocument* pDoc )
// --- ScChangeActionContent -----------------------------------------------
-const sal_uInt16 nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeActionContent);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent, nMemPoolChangeActionContent, nMemPoolChangeActionContent )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
ScChangeActionContent::ScChangeActionContent( const sal_uLong nActionNumber,
const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
@@ -2031,7 +2028,7 @@ ScChangeActionReject::ScChangeActionReject(const sal_uLong nActionNumber, const
// --- ScChangeTrack -------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo, 16, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
const SCSIZE ScChangeTrack::nContentSlots =
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fc6c0a2..ac4886c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -79,8 +79,8 @@
static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
-IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter, 32, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
ScTokenStack* ScInterpreter::pGlobalStack = NULL;
bool ScInterpreter::bGlobalStackInUse = false;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 133324f..0bbb3d6 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -112,17 +112,14 @@ namespace
// Since RawTokens are temporary for the compiler, don't align on 4k and waste memory.
// ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036
-IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken, 8, 4 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken )
// Some ScDoubleRawToken, FixMembers + sizeof(double) ~= 16
-const sal_uInt16 nMemPoolDoubleRawToken = 0x0400 / sizeof(ScDoubleRawToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken, nMemPoolDoubleRawToken, nMemPoolDoubleRawToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken )
// Need a whole bunch of ScSingleRefToken
-const sal_uInt16 nMemPoolSingleRefToken = (0x4000 - 64) / sizeof(ScSingleRefToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken, nMemPoolSingleRefToken, nMemPoolSingleRefToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken )
// Need quite a lot of ScDoubleRefToken
-const sal_uInt16 nMemPoolDoubleRefToken = (0x2000 - 64) / sizeof(ScDoubleRefToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken, nMemPoolDoubleRefToken, nMemPoolDoubleRefToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken )
// --- helpers --------------------------------------------------------------
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 11757bb..1d7f190 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -158,7 +158,7 @@ public:
void Merge( const XclListColor& rColor );
};
-IMPL_FIXEDMEMPOOL_NEWDEL( XclListColor, 100, 100 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclListColor )
XclListColor::XclListColor( const Color& rColor, sal_uInt32 nColorId ) :
maColor( rColor ),
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 2571188..d356990 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -570,7 +570,7 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm )
// ----------------------------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell )
XclExpNumberCell::XclExpNumberCell(
const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -616,7 +616,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm )
// ----------------------------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
XclExpBooleanCell::XclExpBooleanCell(
const XclExpRoot rRoot, const XclAddress& rXclPos,
@@ -647,7 +647,7 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
rStrm << sal_uInt16( mbValue ? 1 : 0 ) << EXC_BOOLERR_BOOL;
}
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell )
XclExpLabelCell::XclExpLabelCell(
const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -757,7 +757,7 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm )
// ----------------------------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
XclExpFormulaCell::XclExpFormulaCell(
const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -1194,7 +1194,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes
// ----------------------------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell )
XclExpBlankCell::XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId ) :
XclExpMultiCellBase( EXC_ID3_BLANK, EXC_ID_MULBLANK, 0, rXclPos )
@@ -1244,7 +1244,7 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress
// ----------------------------------------------------------------------------
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell )
XclExpRkCell::XclExpRkCell(
const XclExpRoot& rRoot, const XclAddress& rXclPos,
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 2131095..53a75d0 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1588,7 +1588,7 @@ ScStyleSheet* XclImpXFBuffer::CreateStyleSheet( sal_uInt16 nXFIndex )
// Buffer for XF indexes in cells =============================================
-IMPL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange, 100, 500 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange )
bool XclImpXFRange::Expand( SCROW nScRow, const XclImpXFIndex& rXFIndex )
{
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 6a2119a..27f687d 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -59,34 +59,34 @@ using namespace com::sun::star;
String aEmptyStr; // Konstante Strings
String aDotStr('.'); // Konstante Strings
-IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet, 25, 25 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwEndNode, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBox, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints, 25, 25 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs, 100, 100 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwEndNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBox )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos )
Size GetGraphicSizeTwip( const Graphic& rGraphic, OutputDevice* pOutDev )
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 00d95c0..36ea67f 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -36,7 +36,7 @@
SV_IMPL_PTRARR( SwUnoCrsrTbl, SwUnoCrsrPtr )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing )
: SwCursor( rPos, pRing, false ), SwModify( 0 ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 70fb124..49a66be 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2462,7 +2462,7 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
// Implementierung teilweise inline im hxx
TYPEINIT1( SwFrmFmt, SwFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt )
void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
{
@@ -2690,7 +2690,7 @@ String SwFrmFmt::GetDescription() const
// Implementierung teilweise inline im hxx
TYPEINIT1( SwFlyFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt )
SwFlyFrmFmt::~SwFlyFrmFmt()
{
@@ -3130,7 +3130,7 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
// Implementierung teilweise inline im hxx
TYPEINIT1( SwDrawFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt )
SwDrawFrmFmt::~SwDrawFrmFmt()
{
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index de79a5a..96eecc9 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -53,11 +53,11 @@ long SwTxtFrm::nMinPrtLine = 0;
SwContourCache *pContourCache = 0;
SwDropCapCache *pDropCapCache = 0;
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion, 50, 50 ) //Absaetze
-IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout, 150, 150 ) //Zeilen
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion, 150, 150 ) //z.B. Blanks am Zeilenende
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion, 200, 100 ) //Attributwechsel
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion ) //Absaetze
+IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout ) //Zeilen
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) //z.B. Blanks am Zeilenende
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion ) //Attributwechsel
/*************************************************************************
* _TextInit(), _TextFinit()
diff --git a/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx
index 0d81878..419941b 100644
--- a/tools/inc/tools/mempool.hxx
+++ b/tools/inc/tools/mempool.hxx
@@ -28,6 +28,9 @@
#ifndef _SVMEMPOOL_HXX
#define _SVMEMPOOL_HXX
+#include "sal/config.h"
+
+#include "sal/macros.h"
#include "tools/toolsdllapi.h"
#include "tools/solar.h"
@@ -44,9 +47,7 @@ class TOOLS_DLLPUBLIC FixedMemPool
public:
FixedMemPool( char const * pTypeName,
- sal_uInt16 nTypeSize,
- sal_uInt16 nInitSize = 512,
- sal_uInt16 nGrowSize = 256 );
+ sal_uInt16 nTypeSize );
~FixedMemPool();
void* Alloc();
@@ -100,11 +101,8 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \
DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool )
-#define IMPL_FIXEDMEMPOOL_STRING(x) IMPL_FIXEDMEMPOOL_MAKESTRING(x)
-#define IMPL_FIXEDMEMPOOL_MAKESTRING(x) #x
-
-#define IMPL_FIXEDMEMPOOL_NEWDEL( Class, InitSize, GrowSize) \
- FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) );
+#define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \
+ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) );
#define DECL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \
private: \
@@ -113,16 +111,13 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
DECL_FIXEDMEMPOOL_NEW_DECL(); \
DECL_FIXEDMEMPOOL_DEL_DECL();
-#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class, InitSize, GrowSize) \
- FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) ); \
+#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \
+ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \
DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \
IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \
DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \
IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
-#define INIT_FIXEDMEMPOOL_NEWDEL_DLL( Class, aPool, InitSize, GrowSize ) \
- aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) )
-
#endif // _SVMEMPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx
index 091d38d..3d730de 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.cxx
@@ -39,8 +39,7 @@
|*
*************************************************************************/
-FixedMemPool::FixedMemPool (
- char const * pTypeName, sal_uInt16 nTypeSize, sal_uInt16, sal_uInt16)
+FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize)
: m_pTypeName (pTypeName)
{
char name[RTL_CACHE_NAME_LENGTH + 1];
diff --git a/tools/workben/mempooltest.cxx b/tools/workben/mempooltest.cxx
index e99e217..c5ee739 100644
--- a/tools/workben/mempooltest.cxx
+++ b/tools/workben/mempooltest.cxx
@@ -8,7 +8,7 @@ struct MempoolTest
DECL_FIXEDMEMPOOL_NEWDEL(MempoolTest);
};
-IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest, 0, 0);
+IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest);
int main()
{
commit e7f09c6e5b3228ac1e0603759d51dfec745a0e6a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:37:37 2012 +0100
Remove some dated Windows-only debug stuff.
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 0a3ee93..d8f8dd6 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/datetime/tdate \
tools/source/datetime/ttime \
tools/source/debug/debug \
- tools/source/debug/stcktree \
tools/source/fsys/comdep \
tools/source/fsys/dirent \
tools/source/fsys/filecopy \
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index bf28581..83ba82d 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -320,14 +320,6 @@ inline void DbgPrintFile( const sal_Char* pLine )
DbgFunc( DBG_FUNC_PRINTFILE, (void*)(sal_Char*)pLine );
}
-// --- Dbg-StackTree-Functions ---
-
-TOOLS_DLLPUBLIC void DbgStartStackTree();
-TOOLS_DLLPUBLIC void DbgEndStackTree();
-void* DbgGetStackTree( sal_uIntPtr nAlloc = 0 );
-void DbgFreeStackTree( void* p, sal_uIntPtr nAlloc = 0 );
-void DbgPrintStackTree( void* p );
-
// --- Dbg-Output ---
#define DBG_OUT_TRACE 1
@@ -399,9 +391,6 @@ public:
#define DBG_DEBUGEND() DbgDebugEnd()
#define DBG_GLOBALDEBUGEND() DbgGlobalDebugEnd()
-#define DBG_STARTAPPEXECUTE() DbgStartStackTree()
-#define DBG_ENDAPPEXECUTE() DbgEndStackTree()
-
#define DBG_PROFSTART( aName ) \
DbgProf( DBG_PROF_START, DBG_FUNC( aName ) )
@@ -504,9 +493,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_DEBUGEND() ((void)0)
#define DBG_GLOBALDEBUGEND() ((void)0)
-#define DBG_STARTAPPEXECUTE() ((void)0)
-#define DBG_ENDAPPEXECUTE() ((void)0)
-
#define DBG_NAME( aName )
#define DBG_NAMEEX( aName )
#define DBG_NAMEEX_VISIBILITY( aName, vis )
diff --git a/tools/source/debug/stcktree.cxx b/tools/source/debug/stcktree.cxx
deleted file mode 100644
index 3a4a392..0000000
--- a/tools/source/debug/stcktree.cxx
+++ /dev/null
@@ -1,321 +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.
- *
- ************************************************************************/
-
-
-#include <string.h>
-
-#include <tools/debug.hxx>
-
-// -----------------------------------------------------------------------
-
-#if defined( DBG_UTIL ) && defined( WNT ) && defined( INTEL )
-
-struct ImpDbgStackTree
-{
- ImpDbgStackTree* pLeft_;
- ImpDbgStackTree* pRight_;
- ImpDbgStackTree* pCaller_;
- ImpDbgStackTree* pSub_;
- sal_uIntPtr nIP_;
- sal_uIntPtr nBytesLeak_;
- sal_uIntPtr nBytesPeak_;
- sal_uIntPtr nBytes_;
- sal_uIntPtr nCountLeak_;
- sal_uIntPtr nCountPeak_;
- sal_uIntPtr nCount_;
- sal_uIntPtr nMax_;
- sal_uIntPtr nMin_;
-
- ImpDbgStackTree( ImpDbgStackTree* pSub, sal_uIntPtr nIP );
- ~ImpDbgStackTree();
-
- ImpDbgStackTree* Add( sal_uIntPtr nAlloc, sal_uIntPtr* pBP, sal_uIntPtr nIP );
- void Print( int nLevel, sal_uIntPtr nCount, sal_uIntPtr nCountLeak );
- void Print( int nLevel );
-};
-
-static ImpDbgStackTree* pImpDbgStackTreeRoot = NULL;
-static sal_uIntPtr* pImpDbgStackTreeBP = NULL;
-static sal_uIntPtr nImpDbgStackTreeMain = 0;
-static int nImpDbgStackTreeSem = 0;
-
-// -----------------------------------------------------------------------
-
-ImpDbgStackTree::ImpDbgStackTree( ImpDbgStackTree* pSub, sal_uIntPtr nIP )
-{
- pSub_ = pSub;
- nIP_ = nIP;
- pLeft_ = pRight_ = pCaller_ = NULL;
- nBytesLeak_ = nBytesPeak_ = nBytes_ = 0;
- nCountLeak_ = nCountPeak_ = nCount_ = 0;
-}
-
-// -----------------------------------------------------------------------
-
-ImpDbgStackTree::~ImpDbgStackTree()
-{
- if ( pLeft_ )
- delete pLeft_;
- if ( pRight_ )
- delete pRight_;
- if ( pCaller_ )
- delete pCaller_;
-}
-
-// -----------------------------------------------------------------------
-
-void ImpDbgStackTree::Print( int nLevel, sal_uIntPtr nCount, sal_uIntPtr nCountLeak )
-{
- if ( pLeft_ )
- pLeft_->Print( nLevel, nCount, nCountLeak );
-
- if ( nCount_ >= nCount && nCountLeak_ >= nCountLeak )
- {
- if ( nMax_ == nMin_ )
- {
- sal_uIntPtr nTemp = nCountLeak_ * nMin_;
- DbgOutf( "%*c%08lx Count=%lu/%lu/%lu Bytes=%lu/%lu/%lu Size=%lu",
- nLevel, ' ', nIP_,
- nCount_, nCountPeak_, nCountLeak_,
- nBytes_, nBytesPeak_, nTemp,
- nMin_ );
- }
- else
- {
- DbgOutf( "%*c%08lx Count=%lu/%lu/%lu Bytes=%lu/%lu/%lu Size=%lu-%lu",
- nLevel, ' ', nIP_,
- nCount_, nCountPeak_, nCountLeak_,
- nBytes_, nBytesPeak_, nBytesLeak_,
- nMin_, nMax_ );
- }
-
- if ( pCaller_ )
- if( nLevel > 3 && nCountLeak )
- pCaller_->Print( nLevel + 1, nCount, 1 );
- else
- pCaller_->Print( nLevel + 1, nCount, nCountLeak );
- }
-
- if ( pRight_ )
- pRight_->Print( nLevel, nCount, nCountLeak );
-}
-
-// -----------------------------------------------------------------------
-
-void ImpDbgStackTree::Print( int nLevel )
-{
- if ( pSub_ )
- pSub_->Print( nLevel + 1 );
- DbgOutf( "%*c%08lx", nLevel, ' ',nIP_ );
-}
-
-// -----------------------------------------------------------------------
-
-ImpDbgStackTree* ImpDbgStackTree::Add( sal_uIntPtr nAlloc, sal_uIntPtr *pBP, sal_uIntPtr nIP )
-{
- if ( nIP < nIP_ )
- {
- if ( !pLeft_ )
- pLeft_ = new ImpDbgStackTree( pSub_, nIP );
- return pLeft_->Add( nAlloc, pBP, nIP );
- }
- if ( nIP > nIP_ )
- {
- if ( !pRight_ )
- pRight_ = new ImpDbgStackTree( pSub_, nIP );
- return pRight_->Add( nAlloc, pBP, nIP );
- }
-
- nCount_++;
- nCountLeak_++;
- if ( nCountLeak_ > nCountPeak_ )
- nCountPeak_ = nCountLeak_;
- nBytes_ += nAlloc;
- nBytesLeak_ += nAlloc;
- if ( nBytesLeak_ > nBytesPeak_ )
- nBytesPeak_ = nBytesLeak_;
- if ( nCount_ == 1 )
- nMax_ = nMin_ = nAlloc;
- else if ( nMax_ < nAlloc )
- nMax_ = nAlloc;
- else if ( nMin_ > nAlloc )
- nMin_ = nAlloc;
-
- if ( !(pBP[0] & 3) && (sal_uIntPtr)pBP < pBP[0] && pBP[0] < (sal_uIntPtr)pImpDbgStackTreeBP )
- {
- pBP = (sal_uIntPtr*)pBP[0];
- nIP = pBP[1];
- if ( 0x01100000 <= nIP && nIP < 0x20000000 && nIP != nImpDbgStackTreeMain )
- {
- if ( !pCaller_ )
- pCaller_ = new ImpDbgStackTree( this, nIP );
- return pCaller_->Add( nAlloc, pBP, nIP );
- }
- else
- return this;
- }
-
- return this;
-}
-
-// -----------------------------------------------------------------------
-
-void DbgStartStackTree()
-{
- if ( !nImpDbgStackTreeMain )
- {
- sal_uIntPtr* pBP;
- __asm mov pBP, ebp;
-
- pImpDbgStackTreeBP = (sal_uIntPtr*)pBP[0];
- nImpDbgStackTreeMain = pImpDbgStackTreeBP[1];
- }
-}
-
-// -----------------------------------------------------------------------
-
-void DbgEndStackTree()
-{
- if ( nImpDbgStackTreeMain )
- {
- nImpDbgStackTreeMain = 0;
- if ( pImpDbgStackTreeRoot )
- {
- // Ausgaben ins File umleiten
- DbgData* pData = DbgGetData();
- sal_uIntPtr nOldOut = pData->nTraceOut;
- pData->nTraceOut = DBG_OUT_FILE;
-
- DbgOutf( "Leak-Report" );
- DbgOutf( "===========" );
- DbgOutf( "Mem-StackTree:" );
- DbgOutf( "{" );
- pImpDbgStackTreeRoot->Print( 1, 1, 2 );
- DbgOutf( "}" );
-
- DbgOutf( "Alloc-Report" );
- DbgOutf( "===========" );
- DbgOutf( "Mem-StackTree:" );
- DbgOutf( "{" );
- pImpDbgStackTreeRoot->Print( 1, 1000, 0 ); // ???
- DbgOutf( "}" );
-
- pData->nTraceOut = nOldOut;
-
- nImpDbgStackTreeSem++;
- delete pImpDbgStackTreeRoot;
- pImpDbgStackTreeRoot = NULL;
- nImpDbgStackTreeSem--;
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-void* DbgGetStackTree( sal_uIntPtr nAlloc )
-{
- ImpDbgStackTree* pReturn = NULL;
-
- if ( nImpDbgStackTreeMain && !nImpDbgStackTreeSem )
- {
- nImpDbgStackTreeSem++;
-
- sal_uIntPtr* pBP;
- __asm mov pBP, ebp;
-
- sal_uIntPtr nIP = pBP[1];
- if ( !pImpDbgStackTreeRoot )
- pImpDbgStackTreeRoot = new ImpDbgStackTree( NULL, nIP );
- pReturn = pImpDbgStackTreeRoot->Add( nAlloc, pBP, nIP );
- nImpDbgStackTreeSem--;
- }
-
- return pReturn;
-}
-
-// -----------------------------------------------------------------------
-
-void DbgFreeStackTree( void* pVoid, sal_uIntPtr nAlloc )
-{
- ImpDbgStackTree* p = (ImpDbgStackTree*)pVoid;
-
- if ( p && nImpDbgStackTreeMain && !nImpDbgStackTreeSem )
- {
- if ( nAlloc < p->nMin_ )
- nAlloc = p->nMin_;
-
- p->nCountLeak_--;
- p->nBytesLeak_ -= nAlloc;
-
- if ( p->nMax_ && 0xFFFFFFFF / p->nMax_ > p->nCountLeak_ )
- {
- if ( p->nBytesLeak_ > p->nMax_ * p->nCountLeak_ )
- {
- nAlloc += p->nBytesLeak_ - p->nMax_ * p->nCountLeak_;
- p->nBytesLeak_ = p->nMax_ * p->nCountLeak_;
- }
- }
-
- if ( p->pSub_ )
- DbgFreeStackTree( (void*)(p->pSub_), nAlloc );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void DbgPrintStackTree( void* pVoid )
-{
- ImpDbgStackTree* p = (ImpDbgStackTree*)pVoid;
-
- if ( p && nImpDbgStackTreeMain && !nImpDbgStackTreeSem )
- {
- // Ausgaben ins File umleiten
- DbgData* pData = DbgGetData();
- sal_uIntPtr nOldOut = pData->nTraceOut;
- pData->nTraceOut = DBG_OUT_FILE;
-
- DbgOutf( "Mem-StackTree:" );
- DbgOutf( "{" );
- p->Print( 1 );
- DbgOutf( "}" );
-
- pData->nTraceOut = nOldOut;
- }
-}
-
-#else
-
-void DbgStartStackTree() {}
-void DbgEndStackTree() {}
-void* DbgGetStackTree( sal_uIntPtr ) { return NULL; }
-void DbgFreeStackTree( void*, sal_uIntPtr ) {}
-void DbgPrintStackTree( void* ) {}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index f3e3fc2..10d7f63 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -423,8 +423,6 @@ const KeyCode* Application::GetReservedKeyCode( sal_uLong i )
void Application::Execute()
{
- DBG_STARTAPPEXECUTE();
-
ImplSVData* pSVData = ImplGetSVData();
pSVData->maAppData.mbInAppExecute = sal_True;
@@ -432,8 +430,6 @@ void Application::Execute()
Application::Yield();
pSVData->maAppData.mbInAppExecute = sal_False;
-
- DBG_ENDAPPEXECUTE();
}
// -----------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list