diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:02:49 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:02:49 +0000 |
| commit | c8cc4c4ea1d9d923dd9e4e02b6fe29f3af5ec258 (patch) | |
| tree | ee204f422a5e55d44309d50a105a2add7ddb7e56 /basic | |
| parent | c4808d6c7c79da66079836c533fafa59e7fe791c (diff) | |
INTEGRATION: CWS obo30 (1.42.22); FILE MERGED
2008/05/30 09:44:46 obo 1.42.22.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index c6e5c422acc5..32bee28a7c79 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sbxmod.cxx,v $ - * $Revision: 1.42 $ + * $Revision: 1.43 $ * * This file is part of OpenOffice.org. * @@ -1273,7 +1273,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer ) bRet = SbxObject::StoreData( rStrm ); if( bRet ) { - pImage->aOUSource = OUString(); + pImage->aOUSource = ::rtl::OUString(); pImage->aComment = aComment; pImage->aName = GetName(); @@ -1296,7 +1296,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer ) BOOL SbModule::LoadBinaryData( SvStream& rStrm ) { - OUString aKeepSource = aOUSource; + ::rtl::OUString aKeepSource = aOUSource; bool bRet = LoadData( rStrm, 2 ); LoadCompleted(); aOUSource = aKeepSource; @@ -2108,4 +2108,3 @@ SbProperty::~SbProperty() SbProcedureProperty::~SbProcedureProperty() {} - |