diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:03:35 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:03:35 +0000 |
commit | c5d82678b20476ffdf5e1fc4a910e8495ecd62dd (patch) | |
tree | 2d6582999d14d89898a689e3e4036ca0badbecad /basic | |
parent | a8fce567887fbcc798ba7fe7ac9a3e9f78b8f25e (diff) |
INTEGRATION: CWS obo30 (1.36.22); FILE MERGED
2008/06/06 07:01:37 obo 1.36.22.2: #i90100# EOL missing
2008/05/30 09:44:46 obo 1.36.22.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/runtime.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index da87378fc921..38cad99d6c12 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: runtime.hxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.38 $ * * This file is part of OpenOffice.org. * @@ -52,7 +52,6 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <unotools/localedatawrapper.hxx> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::container; @@ -167,7 +166,7 @@ public: WildCard* pWildCard; #ifdef _USE_UNO - Sequence< OUString > aDirSeq; + Sequence< ::rtl::OUString > aDirSeq; #endif /* _USE_UNO */ SbiRTLData(); @@ -544,3 +543,4 @@ inline String getFullPathUNC( const String& aRelPath ) void implStepRenameOSL( const String& aSource, const String& aDest ); #endif + |