summaryrefslogtreecommitdiffstats
path: root/basic/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-22 09:34:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-22 09:41:47 +0100
commit70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 (patch)
treeffb31ef817b5f2037cf7c332da422b9179d613d5 /basic/inc
parenti#115255: Skip invalid record(s) where BOF is expected. (diff)
downloadcore-70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1.tar.gz
core-70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1.zip
New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros. * New SAL_STREAM supersedes OSL_FORMAT. * oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now). * TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site cleanup). * Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet addressed. * Some replacements tools String -> rtl::OUString.
Diffstat (limited to 'basic/inc')
-rw-r--r--basic/inc/basic/sbxcore.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index a4abca6d4649..1969adf0cc1c 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -39,6 +39,7 @@
class SvStream;
class String;
class UniString;
+namespace rtl { class OUString; }
// The following Macro defines four (five) necessary methods within a
// SBX object. LoadPrivateData() and StorePrivateData() must be implemented.
@@ -133,7 +134,7 @@ public:
static void RemoveFactory( SbxFactory* );
static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
- static SbxObject* CreateObject( const String& );
+ static SbxObject* CreateObject( const rtl::OUString& );
};
#ifndef SBX_BASE_DECL_DEFINED