[Libreoffice-commits] .: 2 commits - basic/inc basic/source connectivity/inc desktop/source framework/test linguistic/source sfx2/inc sfx2/source svx/inc svx/source ucb/inc xmlhelp/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Oct 10 19:40:57 PDT 2010
basic/inc/pch/precompiled_basic.hxx | 2
basic/source/uno/namecont.cxx | 10
connectivity/inc/connectivity/FValue.hxx | 4
desktop/source/app/officeipcthread.cxx | 2
desktop/source/app/officeipcthread.hxx | 4
framework/test/threadtest.cxx | 2
framework/test/threadtest/threadtest.cxx | 4
linguistic/source/lngopt.cxx | 8
linguistic/source/lngopt.hxx | 2
sfx2/inc/pch/precompiled_sfx2.hxx | 4
sfx2/source/dialog/filedlghelper.cxx | 4
sfx2/source/dialog/mailmodelapi.cxx | 6
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/doctemplates.cxx | 5
sfx2/source/inet/inettbc.cxx | 2
svx/inc/pch/precompiled_svx.hxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/fmcomp/trace.cxx | 18 -
svx/source/form/fmsrcimp.cxx | 2
svx/source/inc/fmshimp.hxx | 1
svx/source/inc/fmsrcimp.hxx | 4
svx/source/inc/trace.hxx | 4
ucb/inc/pch/precompiled_ucb.hxx | 2
xmlhelp/source/cxxhelp/provider/content.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 318 +++++++++++------------
xmlhelp/source/cxxhelp/provider/provider.cxx | 4
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 180 ++++++-------
xmlhelp/source/treeview/tvread.cxx | 192 ++++++-------
28 files changed, 396 insertions(+), 396 deletions(-)
New commits:
commit d7968478a94d6baf5d814262f924801ddb90e296
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 21:29:05 2010 -0500
merge vosremoval-thread patch
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b86d945..854646e 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -919,7 +919,7 @@ void SAL_CALL OfficeIPCThread::run()
TimeValue tval;
tval.Seconds = 1;
tval.Nanosec = 0;
- sleep( tval );
+ wait( tval );
}
} while( schedule() );
}
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index e53d034..15753f6 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -32,11 +32,11 @@
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <vos/pipe.hxx>
#include <vos/security.hxx>
-#include <vos/thread.hxx>
#include <vos/signal.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase2.hxx>
#include <osl/conditn.hxx>
+#include <osl/thread.hxx>
#include "boost/optional.hpp"
namespace desktop
@@ -72,7 +72,7 @@ struct ProcessDocumentsRequest
};
class DispatchWatcher;
-class OfficeIPCThread : public vos::OThread
+class OfficeIPCThread : public osl::Thread
{
private:
static OfficeIPCThread* pGlobalOfficeIPCThread;
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index e6c37fe..ed88043 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -488,7 +488,7 @@ sal_Int32 ThreadSafeClass::workA( sal_Int32 nA ,
Otherwise all threads are sychron after first 2,3...5 calls - I think!
*//*-*****************************************************************************************************/
-class TestThread : public OThread
+class TestThread : public osl::Thread
{
public:
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 3e51ed4..5331e6b 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -50,12 +50,12 @@
//_________________________________________________________________________________________________________________
#include <rtl/random.h>
#include <vos/process.hxx>
-#include <vos/thread.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/time.h>
#include <osl/interlock.h>
+#include <osl/thread.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
@@ -485,7 +485,7 @@ sal_Int32 ThreadSafeClass::workA( sal_Int32 nA ,
Otherwise all threads are sychron after first 2,3...5 calls - I think!
*//*-*****************************************************************************************************/
-class TestThread : public OThread
+class TestThread : public osl::Thread
{
public:
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index d377f85..2a9fb55 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -64,7 +64,7 @@ using namespace com::sun::star::registry;
// static member intialization
SvtLinguOptions * LinguOptions::pData = NULL;
-vos::ORefCount LinguOptions::aRefCount;
+oslInterlockedCount LinguOptions::nRefCount;
LinguOptions::LinguOptions()
@@ -76,14 +76,14 @@ LinguOptions::LinguOptions()
aLinguCfg.GetOptions( *pData );
}
- ++aRefCount;
+ osl_incrementInterlockedCount( &nRefCount );
}
LinguOptions::LinguOptions(const LinguOptions & /*rOpt*/)
{
DBG_ASSERT( pData, "lng : data missing" );
- ++aRefCount;
+ osl_incrementInterlockedCount( &nRefCount );
}
@@ -91,7 +91,7 @@ LinguOptions::~LinguOptions()
{
MutexGuard aGuard( GetLinguMutex() );
- if (--aRefCount == 0)
+ if ( osl_decrementInterlockedCount( &nRefCount ) == 0 )
{
delete pData; pData = NULL;
}
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 918f8e2..bbc5c45 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -68,7 +68,7 @@ namespace com { namespace sun { namespace star {
class LinguOptions
{
static SvtLinguOptions *pData;
- static vos::ORefCount aRefCount; // number of objects of this class
+ static oslInterlockedCount nRefCount; // number of objects of this class
//! uses default assignment-operator
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 77587fe..308d41e 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -662,7 +662,7 @@
#include "vos/process.hxx"
#include "vos/security.hxx"
#include "vos/socket.hxx"
-#include "vos/thread.hxx"
+#include "osl/thread.hxx"
#include "vos/xception.hxx"
//---MARKER---
#endif
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index c885791..5963ab2 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -63,9 +63,9 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/localfilehelper.hxx>
-#include <vos/thread.hxx>
#include <vos/mutex.hxx>
#include <vos/security.hxx>
+#include <osl/thread.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
@@ -1156,7 +1156,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl()
#define nMagic -1
-class PickerThread_Impl : public ::vos::OThread
+class PickerThread_Impl : public ::osl::Thread
{
uno::Reference < XFilePicker > mxPicker;
::vos::OMutex maMutex;
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index f056825..3c20ffa 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -52,7 +52,7 @@
#include <unotools/streamhelper.hxx>
#include <unotools/configitem.hxx>
#include <comphelper/mediadescriptor.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vcl/msgbox.hxx>
#include "mailmodelapi.hxx"
@@ -148,8 +148,8 @@ namespace
}
-// class OThread
-class OMailSendThreadImpl : public ::vos::OThread
+// class osl::Thread
+class OMailSendThreadImpl : public ::osl::Thread
{
public:
OMailSendThreadImpl(
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 0b1b6c6..a34b58a 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -31,7 +31,7 @@
#include <limits.h>
#include <com/sun/star/uno/Any.h>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <tools/resary.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 6d758d6..6b002b6 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -303,7 +303,7 @@ public:
//=============================================================================
-class Updater_Impl : public ::vos::OThread
+class Updater_Impl : public ::osl::Thread
{
private:
SfxDocTplService_Impl *mpDocTemplates;
@@ -1150,7 +1150,8 @@ SfxDocTplService_Impl::~SfxDocTplService_Impl()
if ( mpUpdater )
{
- mpUpdater->kill();
+ mpUpdater->terminate();
+ mpUpdater->join();
delete mpUpdater;
}
}
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index b58d12e..da15d3e 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -39,7 +39,7 @@
#include <svl/folderrestriction.hxx>
#include <vcl/toolbox.hxx>
#include <toolkit/unohlp.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <rtl/ustring.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8dda799..1f6b883 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -690,6 +690,7 @@
#include "osl/nlsupport.h"
#include "osl/process.h"
#include "osl/security.hxx"
+#include "osl/thread.hxx"
#include "rsc/rscsfx.hxx"
#include "rtl/bootstrap.hxx"
#include "rtl/cipher.h"
@@ -944,7 +945,6 @@
#include "vos/mutex.hxx"
#include "vos/ref.hxx"
#include "vos/refernce.hxx"
-#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e9a08fa..d65630c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3626,7 +3626,7 @@ void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
{
TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
::osl::MutexGuard aGuard(m_aAdjustSafety);
- if (::vos::OThread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
+ if (::osl::Thread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
{
m_nAsynAdjustEvent = PostUserEvent(LINK(this, DbGridControl, OnAsyncAdjust), reinterpret_cast< void* >( _bRows ));
m_bPendingAdjustRows = _bRows;
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 55b8ef1..0264ce9 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
//------------------------------------------------------------------------------
::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::vos::OThread::TThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
Tracer::s_aThreadIndents;
//------------------------------------------------------------------------------
@@ -44,13 +44,13 @@ Tracer::Tracer(const char* _pBlockDescription)
:m_sBlockDescription(_pBlockDescription)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
+ INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -64,13 +64,13 @@ Tracer::Tracer(const char* _pBlockDescription)
Tracer::~Tracer()
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ INT32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -84,13 +84,13 @@ Tracer::~Tracer()
void Tracer::TraceString(const char* _pMessage)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -105,13 +105,13 @@ void Tracer::TraceString(const char* _pMessage)
void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3aaa3d5..b36ac9d 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1188,7 +1188,7 @@ void FmSearchEngine::ImplStartNextSearch()
pSearcher->setTerminationHandler(LINK(this, FmSearchEngine, OnSearchTerminated));
pSearcher->createSuspended();
- pSearcher->setPriority(::vos::OThread::TPriority_Lowest);
+ pSearcher->setPriority(osl_Thread_PriorityLowest);
pSearcher->resume();
}
else
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 31103bd..62e8da3 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -65,7 +65,6 @@
#include "svx/fmtools.hxx"
#include "fmsrccfg.hxx"
#include <osl/mutex.hxx>
-#include <vos/thread.hxx>
#include <tools/debug.hxx>
#include <cppuhelper/component.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index c8cc497..afedf71 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -44,7 +44,7 @@
#include <osl/mutex.hxx>
#include <unotools/charclass.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#ifndef _SVSTDARR_ULONGS
#define _SVSTDARR_ULONGS
@@ -61,7 +61,7 @@ SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16)
// ===================================================================================================
class FmSearchEngine;
-class FmSearchThread : public ::vos::OThread
+class FmSearchThread : public ::osl::Thread
{
FmSearchEngine* m_pEngine;
Link m_aTerminationHdl;
diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index c33cf02..9aeccdb 100644
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
@@ -30,7 +30,7 @@
#if defined(DBG_UTIL)
#include <tools/string.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <comphelper/stl_types.hxx>
@@ -39,7 +39,7 @@ class Tracer
{
ByteString m_sBlockDescription;
- DECLARE_STL_STDKEY_MAP( ::vos::OThread::TThreadIdentifier, sal_Int32, MapThreadId2Int );
+ DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
static MapThreadId2Int s_aThreadIndents;
static ::vos::OMutex s_aMapSafety;
commit 26ea5e0aa29eb0d99f4e7edf1f0d6c76dbd84c59
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 19:46:48 2010 -0500
merge vosremoval-diagnoses patch
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 457960e..23e3ff8 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -275,7 +275,7 @@
#include "vcl/wintypes.hxx"
#include "vcl/wrkwin.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
#include "vos/macros.hxx"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index b48c3be..0414059 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -38,7 +38,7 @@
#include <tools/errinf.hxx>
#endif
#include <osl/mutex.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <rtl/uri.hxx>
#include <rtl/strbuf.hxx>
#include <comphelper/processfactory.hxx>
@@ -3179,7 +3179,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia
break;
}
case END_REACHED:
- VOS_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" );
break;
}
}
@@ -3374,7 +3374,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript
{
const Reference< deployment::XPackage >* pUserPackages = m_aUserPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pUserPackages[ m_iUserPackage ];
- VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextUserScriptPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextUserScriptPackage(): Invalid package" );
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
@@ -3427,7 +3427,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
{
const Reference< deployment::XPackage >* pSharedPackages = m_aSharedPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pSharedPackages[ m_iSharedPackage ];
- VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextSharedScriptPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextSharedScriptPackage(): Invalid package" );
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
@@ -3480,7 +3480,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr
{
const Reference< deployment::XPackage >* pBundledPackages = m_aBundledPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pBundledPackages[ m_iBundledPackage ];
- VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextBundledScriptPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextBundledScriptPackage(): Invalid package" );
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 6dedb99..44d65f8 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -309,10 +309,10 @@ namespace connectivity
}
sal_Bool isBound() const { return m_bBound; }
- void setBound(sal_Bool _bBound) { m_bBound = _bBound ? true : false; }
+ void setBound(sal_Bool _bBound) { m_bBound = _bBound ? 1 : 0; }
sal_Bool isModified() const { return m_bModified; }
- void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? true : false; }
+ void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? 1 : 0; }
sal_Bool isSigned() const { return m_bSigned; }
void setSigned(sal_Bool _bMod=sal_True);
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 2fa3604..77587fe 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -656,7 +656,7 @@
#include "vcl/timer.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
#include "vos/module.hxx"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 48490e8..11eaa22 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -174,7 +174,7 @@
#include "ucbhelper/macros.hxx"
#include "ucbhelper/proxydecider.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 32cdbe9..c23996b 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
#include <com/sun/star/io/XActiveDataStreamer.hpp>
#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/propertyvalueset.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 28a7881..ff2f28c 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmlhelp.hxx"
#include "db.hxx"
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <osl/thread.h>
#include <rtl/uri.hxx>
#include <osl/file.hxx>
@@ -43,12 +43,12 @@
#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/beans/Optional.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XConfigManager.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
@@ -177,10 +177,10 @@ Databases::Databases( sal_Bool showBasic,
// m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
m_vReplacement[5] = productName;
m_vReplacement[6] = productVersion;
-
+
setInstallPath( instPath );
- m_xSFA = Reference< ucb::XSimpleFileAccess >(
+ m_xSFA = Reference< ucb::XSimpleFileAccess >(
m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW );
}
@@ -188,17 +188,17 @@ Databases::Databases( sal_Bool showBasic,
Databases::~Databases()
{
// release stylesheet
-
+
delete[] m_pCustomCSSDoc;
-
+
// release errorDocument
-
+
delete[] m_pErrorDoc;
-
+
// unload the databases
-
+
{
- // DatabasesTable
+ // DatabasesTable
DatabasesTable::iterator it = m_aDatabases.begin();
while( it != m_aDatabases.end() )
{
@@ -208,10 +208,10 @@ Databases::~Databases()
++it;
}
}
-
+
{
// ModInfoTable
-
+
ModInfoTable::iterator it = m_aModInfo.begin();
while( it != m_aModInfo.end() )
{
@@ -219,10 +219,10 @@ Databases::~Databases()
++it;
}
}
-
+
{
// KeywordInfoTable
-
+
KeywordInfoTable::iterator it = m_aKeywordInfo.begin();
while( it != m_aKeywordInfo.end() )
{
@@ -330,16 +330,16 @@ void Databases::replaceName( rtl::OUString& oustring ) const
sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off;
bool cap = false;
rtl::OUStringBuffer aStrBuf( 0 );
-
+
while( true )
{
++idx;
idx1 = oustring.indexOf( sal_Unicode('%'),idx);
idx2 = oustring.indexOf( sal_Unicode('$'),idx);
-
+
if(idx1 == -1 && idx2 == -1)
break;
-
+
if(idx1 == -1)
idx = idx2;
else if(idx2 == -1)
@@ -351,7 +351,7 @@ void Databases::replaceName( rtl::OUString& oustring ) const
else if(idx2 < idx1 )
idx = idx2;
}
-
+
if( oustring.indexOf( prodName,idx ) == idx )
off = PRODUCTNAME;
else if( oustring.indexOf( prodVersion,idx ) == idx )
@@ -368,7 +368,7 @@ void Databases::replaceName( rtl::OUString& oustring ) const
off = NEWPRODUCTVERSION;
else
off = -1;
-
+
if( off != -1 )
{
if( ! cap )
@@ -376,13 +376,13 @@ void Databases::replaceName( rtl::OUString& oustring ) const
cap = true;
aStrBuf.ensureCapacity( 256 );
}
-
+
aStrBuf.append( &oustring.getStr()[k],idx - k );
aStrBuf.append( m_vReplacement[off] );
k = idx + m_vAdd[off];
}
}
-
+
if( cap )
{
if( k < oustring.getLength() )
@@ -392,24 +392,24 @@ void Databases::replaceName( rtl::OUString& oustring ) const
}
-
+
rtl::OUString Databases::getInstallPathAsSystemPath()
{
osl::MutexGuard aGuard( m_aMutex );
-
+
if( ! m_aInstallDirectoryAsSystemPath.getLength() )
{
#ifdef DBG_UTIL
bool bla =
osl::FileBase::E_None ==
osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
- VOS_ENSURE( bla,"HelpProvider, no installpath" );
-#else
- osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
+ OSL_ENSURE( bla,"HelpProvider, no installpath" );
+#else
+ osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath );
#endif
}
-
+
return m_aInstallDirectoryAsSystemPath;
}
@@ -419,7 +419,7 @@ rtl::OUString Databases::getInstallPathAsSystemPath()
rtl::OUString Databases::getInstallPathAsURL()
{
osl::MutexGuard aGuard( m_aMutex );
-
+
return m_aInstallDirectory;
}
@@ -431,32 +431,32 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin
rtl::OUString fileName,dirName = getInstallPathAsURL() + processLang( Language );
osl::Directory dirFile( dirName );
- osl::DirectoryItem aDirItem;
+ osl::DirectoryItem aDirItem;
osl::FileStatus aStatus( FileStatusMask_FileName );
-
+
sal_Int32 idx;
if( osl::FileBase::E_None != dirFile.open() )
return m_avModules;
-
- while( dirFile.getNextItem( aDirItem ) == osl::FileBase::E_None &&
+
+ while( dirFile.getNextItem( aDirItem ) == osl::FileBase::E_None &&
aDirItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
{
if( ! aStatus.isValid( FileStatusMask_FileName ) )
continue;
-
+
fileName = aStatus.getFileName();
-
+
// Check, whether fileName is of the form *.cfg
idx = fileName.lastIndexOf( sal_Unicode( '.' ) );
-
+
if( idx == -1 )
continue;
-
+
const sal_Unicode* str = fileName.getStr();
-
- if( fileName.getLength() == idx + 4 &&
- ( str[idx + 1] == 'c' || str[idx + 1] == 'C' ) &&
+
+ if( fileName.getLength() == idx + 4 &&
+ ( str[idx + 1] == 'c' || str[idx + 1] == 'C' ) &&
( str[idx + 2] == 'f' || str[idx + 2] == 'F' ) &&
( str[idx + 3] == 'g' || str[idx + 3] == 'G' ) &&
( fileName = fileName.copy(0,idx).toAsciiLowerCase() ).compareToAscii( "picture" ) != 0 ) {
@@ -467,7 +467,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin
}
}
return m_avModules;
-}
+}
@@ -478,17 +478,17 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Module;
- std::pair< ModInfoTable::iterator,bool > aPair =
- m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
+ std::pair< ModInfoTable::iterator,bool > aPair =
+ m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
ModInfoTable::iterator it = aPair.first;
-
+
if( aPair.second && ! it->second )
{
osl::File cfgFile( getInstallPathAsURL() +
key +
rtl::OUString::createFromAscii( ".cfg" ) );
-
+
if( osl::FileBase::E_None != cfgFile.open( OpenFlag_Read ) )
it->second = 0;
else
@@ -498,16 +498,16 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
sal_Char buffer[2048];
sal_Unicode lineBuffer[1028];
rtl::OUString fileContent;
-
+
while( osl::FileBase::E_None == cfgFile.read( &buffer,2048,nRead ) && nRead )
fileContent += rtl::OUString( buffer,sal_Int32( nRead ),RTL_TEXTENCODING_UTF8 );
-
+
cfgFile.close();
-
+
const sal_Unicode* str = fileContent.getStr();
rtl::OUString current,lang_,program,startid,title,heading,fulltext;
rtl::OUString order = rtl::OUString::createFromAscii( "1" );
-
+
for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
{
sal_Unicode ch = str[ i ];
@@ -516,7 +516,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
if( pos )
{
current = rtl::OUString( lineBuffer,pos );
-
+
if( current.compareToAscii( "Title",5 ) == 0 )
{
title = current.copy( current.indexOf(sal_Unicode( '=' ) ) + 1 );
@@ -557,10 +557,10 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
program,
heading,
fulltext,
- order );
+ order );
}
}
-
+
return it->second;
}
@@ -573,12 +573,12 @@ rtl::OUString Databases::processLang( const rtl::OUString& Language )
rtl::OUString ret;
LangSetTable::iterator it = m_aLangSet.find( Language );
-
+
if( it == m_aLangSet.end() )
{
sal_Int32 idx;
osl::DirectoryItem aDirItem;
-
+
if( osl::FileBase::E_None == osl::DirectoryItem::get( getInstallPathAsURL() + Language,aDirItem ) )
{
ret = Language;
@@ -597,7 +597,7 @@ rtl::OUString Databases::processLang( const rtl::OUString& Language )
ret = it->second;
return ret;
-}
+}
rtl::OUString Databases::country( const rtl::OUString& Language )
@@ -606,7 +606,7 @@ rtl::OUString Databases::country( const rtl::OUString& Language )
if( ( idx = Language.indexOf( '-' ) ) != -1 ||
( idx = Language.indexOf( '_' ) ) != -1 )
return Language.copy( 1+idx );
-
+
return rtl::OUString();
}
@@ -618,7 +618,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
{
if( ! Database.getLength() || ! Language.getLength() )
return 0;
-
+
osl::MutexGuard aGuard( m_aMutex );
@@ -630,21 +630,21 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
else
key = *pExtensionPath + Language + dbFileName; // make unique, don't change language
- std::pair< DatabasesTable::iterator,bool > aPair =
+ std::pair< DatabasesTable::iterator,bool > aPair =
m_aDatabases.insert( DatabasesTable::value_type( key,0 ) );
-
- DatabasesTable::iterator it = aPair.first;
-
+
+ DatabasesTable::iterator it = aPair.first;
+
if( aPair.second && ! it->second )
{
Db* table = new Db();
-
+
rtl::OUString fileNameOU;
if( pExtensionPath )
{
- rtl::OUString aExpandedURL = expandURL( *pExtensionPath );
+ rtl::OUString aExpandedURL = expandURL( *pExtensionPath );
aExpandedURL += Language + dbFileName;
- osl::FileBase::getSystemPathFromFileURL( aExpandedURL, fileNameOU );
+ osl::FileBase::getSystemPathFromFileURL( aExpandedURL, fileNameOU );
}
else
fileNameOU = getInstallPathAsSystemPath() + key;
@@ -675,7 +675,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
delete table;
table = 0;
}
-
+
it->second = table;
}
@@ -689,16 +689,16 @@ Databases::getCollator( const rtl::OUString& Language,
(void)System;
rtl::OUString key = Language;
-
+
osl::MutexGuard aGuard( m_aMutex );
-
+
CollatorTable::iterator it =
m_aCollatorTable.insert( CollatorTable::value_type( key,0 ) ).first;
-
+
if( ! it->second.is() )
{
- it->second =
- Reference< XCollator > (
+ it->second =
+ Reference< XCollator > (
m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ),
m_xContext ), UNO_QUERY );
rtl::OUString langStr = processLang(Language);
@@ -727,38 +727,38 @@ Databases::getCollator( const rtl::OUString& Language,
rtl::OUString() ),
0 );
}
-
+
return it->second;
}
namespace chelp {
-
+
struct KeywordElementComparator
{
KeywordElementComparator( const Reference< XCollator >& xCollator )
: m_xCollator( xCollator )
{ }
-
+
bool operator()( const KeywordInfo::KeywordElement& la,
const KeywordInfo::KeywordElement& ra ) const
{
const rtl::OUString& l = la.key;
const rtl::OUString& r = ra.key;
-
+
bool ret;
-
+
if( m_xCollator.is() )
{
sal_Int32 l1 = l.indexOf( sal_Unicode( ';' ) );
sal_Int32 l3 = ( l1 == -1 ? l.getLength() : l1 );
-
+
sal_Int32 r1 = r.indexOf( sal_Unicode( ';' ) );
sal_Int32 r3 = ( r1 == -1 ? r.getLength() : r1 );
-
+
sal_Int32 c1 = m_xCollator->compareSubstring( l,0,l3,r,0,r3 );
-
+
if( c1 == +1 )
ret = false;
else if( c1 == 0 )
@@ -772,13 +772,13 @@ namespace chelp {
}
else
ret = bool( l < r );
-
+
return ret;
}
-
+
Reference< XCollator > m_xCollator;
}; // end struct KeywordElementComparator
-
+
}
@@ -815,7 +815,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
anchor.push_back( rtl::OUString() );
}
}
-
+
listId.realloc( id.size() );
listAnchor.realloc( id.size() );
listTitle.realloc( id.size() );
@@ -833,7 +833,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
pData = pEmpty;
if( pDb )
{
- rtl::OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );
+ rtl::OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );
DBHelp* pDBHelp = pDb->getDBHelp();
if( pDBHelp != NULL )
{
@@ -855,9 +855,9 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
pData = static_cast<sal_Char*>( data.get_data() );
}
}
-
+
DbtToStringConverter converter( pData, nSize );
-
+
rtl::OUString title = converter.getTitle();
pDatabases->replaceName( title );
listTitle[i] = title;
@@ -934,14 +934,14 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
const rtl::OUString& Language )
{
osl::MutexGuard aGuard( m_aMutex );
-
+
rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Database;
-
- std::pair< KeywordInfoTable::iterator,bool > aPair =
- m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
-
- KeywordInfoTable::iterator it = aPair.first;
-
+
+ std::pair< KeywordInfoTable::iterator,bool > aPair =
+ m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
+
+ KeywordInfoTable::iterator it = aPair.first;
+
if( aPair.second && ! it->second )
{
std::vector<KeywordInfo::KeywordElement> aVector;
@@ -991,7 +991,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
if( !bBelongsToDatabase )
continue;
-
+
aVector.push_back( KeywordInfo::KeywordElement( this,
idmap,
keyword,
@@ -1014,11 +1014,11 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
int nDummy = 0;
#endif
}
-
+
else if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
{
Db* idmap = getBerkeley( Database,Language );
-
+
bool first = true;
Dbc* cursor = 0;
@@ -1041,7 +1041,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
if( !bBelongsToDatabase )
continue;
-
+
aVector.push_back( KeywordInfo::KeywordElement( this,
idmap,
keyword,
@@ -1053,7 +1053,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
first = false;
}
}
-
+
if( cursor ) cursor->close();
}
table.close( 0 );
@@ -1063,11 +1063,11 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
Reference< XCollator > xCollator = getCollator( Language,rtl::OUString());
KeywordElementComparator aComparator( xCollator );
std::sort(aVector.begin(),aVector.end(),aComparator);
-
+
KeywordInfo* pInfo = it->second = new KeywordInfo( aVector );
(void)pInfo;
}
-
+
return it->second;
}
@@ -1082,10 +1082,10 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
rtl::OUString key = processLang(Language) + aSlash + jar;
osl::MutexGuard aGuard( m_aMutex );
-
+
ZipFileTable::iterator it =
m_aZipFileTable.insert( ZipFileTable::value_type( key,Reference< XHierarchicalNameAccess >(0) ) ).first;
-
+
if( ! it->second.is() )
{
rtl::OUString zipFile;
@@ -1112,7 +1112,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
}
Sequence< Any > aArguments( 2 );
-
+
XInputStream_impl* p = new XInputStream_impl( zipFile );
if( p->CtorSuccess() )
{
@@ -1124,7 +1124,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
delete p;
aArguments[ 0 ] <<= zipFile;
}
-
+
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
@@ -1136,16 +1136,16 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
rtl::OUString::createFromAscii(
"com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext );
-
+
if ( xIfc.is() )
{
it->second = Reference< XHierarchicalNameAccess >( xIfc, UNO_QUERY );
-
- VOS_ENSURE( it->second.is(),
+
+ OSL_ENSURE( it->second.is(),
"ContentProvider::createPackage - "
"Got no hierarchical name access!" );
-
- }
+
+ }
}
catch ( RuntimeException & )
{
@@ -1154,7 +1154,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
{
}
}
-
+
return it->second;
}
@@ -1189,20 +1189,20 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
if( aIdentifierInPath.getLength() && aIdentifierOptional.IsPresent )
{
rtl::OUString aUnencodedIdentifier = aIdentifierOptional.Value;
- rtl::OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier,
+ rtl::OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier,
rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
if( !aIdentifierInPath.equals( aIdentifier ) )
{
// path does not start with extension identifier -> ignore
bSuccess = false;
- }
+ }
}
else
{
// No identifier -> ignore
bSuccess = false;
- }
+ }
}
if( bSuccess )
@@ -1212,7 +1212,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
}
}
}
-
+
return xNA;
}
@@ -1226,17 +1226,17 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount
" <body> "
" <help:popup-cut Id=\"";
const sal_Int32 l1 = strlen( pop1 );
-
+
const char* pop3 = "\" Eid=\"";
const sal_Int32 l3 = strlen( pop3 );
- const char* pop5 =
+ const char* pop5 =
"\" xmlns:help=\"http://openoffice.org/2000/help\"></help:popup-cut> "
" </body> "
" </html>";
const sal_Int32 l5 = strlen( pop5 );
sal_Int32 l2,l4;
-
+
rtl::OUString val = urlPar->get_id();
rtl::OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop2 = pop2O.getStr();
@@ -1244,9 +1244,9 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount
val = urlPar->get_eid();
rtl::OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop4 = pop4O.getStr();
-
+
(*byteCount) = l1 + l2 + l3 + l4 + l5;
-
+
*buffer = new char[ 1+*byteCount ];
rtl_copyMemory( *buffer,pop1,l1 );
@@ -1269,7 +1269,7 @@ void Databases::changeCSS(const rtl::OUString& newStyleSheet)
void Databases::cascadingStylesheet( const rtl::OUString& Language,
char** buffer,
int* byteCount )
-{
+{
if( ! m_pCustomCSSDoc )
{
int retry = 2;
@@ -1302,27 +1302,27 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
}
}
}
-
+
while( error && retry )
{
-
+
if( retry == 2 )
- fileURL =
+ fileURL =
getInstallPathAsURL() +
processLang( Language ) +
rtl::OUString::createFromAscii( "/" ) +
aCSS +
rtl::OUString::createFromAscii( ".css" );
else if( retry == 1 )
- fileURL =
+ fileURL =
getInstallPathAsURL() +
aCSS +
rtl::OUString::createFromAscii( ".css" );
-
+
osl::DirectoryItem aDirItem;
osl::File aFile( fileURL );
osl::FileStatus aStatus( FileStatusMask_FileSize );
-
+
if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) &&
osl::FileBase::E_None == aFile.open( OpenFlag_Read ) &&
osl::FileBase::E_None == aDirItem.getFileStatus( aStatus ) )
@@ -1345,19 +1345,19 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
bHighContrastMode = sal_False;
}
}
-
+
if( error )
{
m_nCustomCSSDocLength = 0;
m_pCustomCSSDoc = new char[ 1 ]; // Initialize with 1 to avoid gcc compiler warning
}
}
-
+
*byteCount = m_nCustomCSSDocLength;
*buffer = new char[ 1 + *byteCount ];
(*buffer)[*byteCount] = 0;
rtl_copyMemory( *buffer,m_pCustomCSSDoc,m_nCustomCSSDocLength );
-
+
}
@@ -1408,7 +1408,7 @@ void Databases::setActiveText( const rtl::OUString& Module,
if( bSuccess )
{
- // ensure existence of tmp after for
+ // ensure existence of tmp after for
rtl::OString tmp;
for( int i = 0; i < nSize; ++i )
if( pData[i] == '%' || pData[i] == '$' )
@@ -1442,13 +1442,13 @@ void Databases::setActiveText( const rtl::OUString& Module,
void Databases::setInstallPath( const rtl::OUString& aInstDir )
{
osl::MutexGuard aGuard( m_aMutex );
-
+
osl::FileBase::getFileURLFromSystemPath( aInstDir,m_aInstallDirectory );
//TODO: check returned error code
-
+
if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
m_aInstallDirectory += rtl::OUString::createFromAscii( "/" );
-
+
m_aInstallDirectoryWithoutEncoding = rtl::Uri::decode( m_aInstallDirectory,
rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8 );
@@ -1460,7 +1460,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
ExtensionHelpExistanceMap ExtensionIteratorBase::aHelpExistanceMap;
-ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xContext,
+ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xContext,
Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
: m_xContext( xContext )
, m_rDatabases( rDatabases )
@@ -1503,7 +1503,7 @@ void ExtensionIteratorBase::init()
}
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
- m_xSFA = Reference< ucb::XSimpleFileAccess >(
+ m_xSFA = Reference< ucb::XSimpleFileAccess >(
xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW );
@@ -1600,7 +1600,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
{
const Reference< deployment::XPackage >* pUserPackages = m_aUserPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pUserPackages[ m_iUserPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextUserHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextUserHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1629,7 +1629,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
{
const Reference< deployment::XPackage >* pSharedPackages = m_aSharedPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pSharedPackages[ m_iSharedPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextSharedHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextSharedHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1659,7 +1659,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
const Reference< deployment::XPackage >* pBundledPackages =
m_aBundledPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pBundledPackages[ m_iBundledPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextBundledHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextBundledHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1801,7 +1801,7 @@ Db* DataBaseIterator::nextDb( rtl::OUString* o_pExtensionPath, rtl::OUString* o_
}
case END_REACHED:
- VOS_ENSURE( false, "DataBaseIterator::nextDb(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "DataBaseIterator::nextDb(): Invalid case END_REACHED" );
break;
}
}
@@ -1812,7 +1812,7 @@ Db* DataBaseIterator::nextDb( rtl::OUString* o_pExtensionPath, rtl::OUString* o_
Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xPackage,
rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
{
-
+
beans::Optional< ::rtl::OUString> optRegData;
try
{
@@ -1826,7 +1826,7 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
Db* pRetDb = NULL;
if (optRegData.IsPresent && optRegData.Value.getLength() > 0)
{
- rtl::OUString aRegDataUrl(optRegData.Value);
+ rtl::OUString aRegDataUrl(optRegData.Value);
aRegDataUrl += aSlash;
rtl::OUString aUsedLanguage = m_aLanguage;
@@ -1859,7 +1859,7 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
if( o_pExtensionRegistryPath )
*o_pExtensionRegistryPath = xPackage->getURL() + aSlash + aUsedLanguage;
}
-
+
return pRetDb;
}
@@ -1876,7 +1876,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
switch( m_eState )
{
case INITIAL_MODULE:
- aRetFile =
+ aRetFile =
m_rDatabases.getInstallPathAsSystemPath() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
rtl::OUString::createFromAscii( ".key" );
@@ -1927,7 +1927,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
}
case END_REACHED:
- VOS_ENSURE( false, "DataBaseIterator::nextDbFile(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "DataBaseIterator::nextDbFile(): Invalid case END_REACHED" );
break;
}
}
@@ -2001,7 +2001,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile
}
case END_REACHED:
- VOS_ENSURE( false, "JarFileIterator::nextJarFile(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "JarFileIterator::nextJarFile(): Invalid case END_REACHED" );
break;
}
}
@@ -2034,15 +2034,15 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
rtl::OUString::createFromAscii(
"com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext );
-
+
if ( xIfc.is() )
{
xNA = Reference< XHierarchicalNameAccess >( xIfc, UNO_QUERY );
-
- VOS_ENSURE( xNA.is(),
+
+ OSL_ENSURE( xNA.is(),
"JarFileIterator::implGetJarFromPackage() - "
"Got no hierarchical name access!" );
- }
+ }
}
catch ( RuntimeException & )
{}
@@ -2055,7 +2055,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
sal_Int32 nLastSlash = zipFile.lastIndexOf( '/' );
if( nLastSlash != -1 )
*o_pExtensionPath = zipFile.copy( 0, nLastSlash );
-
+
if( o_pExtensionRegistryPath != NULL )
{
rtl::OUString& rPath = *o_pExtensionPath;
@@ -2065,7 +2065,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
*o_pExtensionRegistryPath += rPath.copy( nLastSlashInPath);
}
}
-
+
return xNA;
}
@@ -2082,7 +2082,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
switch( m_eState )
{
case INITIAL_MODULE:
- aIndexFolder =
+ aIndexFolder =
m_rDatabases.getInstallPathAsURL() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
rtl::OUString::createFromAscii( ".idxl" );
@@ -2120,7 +2120,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
o_rbExtension = true;
break;
}
-
+
case BUNDLED_EXTENSIONS:
{
Reference< deployment::XPackage > xParentPackageBundle;
@@ -2134,7 +2134,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
}
case END_REACHED:
- VOS_ENSURE( false, "IndexFolderIterator::nextIndexFolder(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "IndexFolderIterator::nextIndexFolder(): Invalid case END_REACHED" );
break;
}
}
@@ -2175,7 +2175,7 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
try
{
- xInvocation = Reference< script::XInvocation >(
+ xInvocation = Reference< script::XInvocation >(
m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
"com.sun.star.help.HelpIndexer" ), m_xContext ) , UNO_QUERY );
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 75dd671..2d1bfd1 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <osl/file.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <ucbhelper/contentidentifier.hxx>
#include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index ab1440e..5c3c63b 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -35,7 +35,7 @@
#endif
#include <string.h>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.hxx>
#include <osl/thread.h>
#include <rtl/memory.h>
#include <osl/file.hxx>
@@ -70,13 +70,13 @@ namespace chelp {
{
return ((ch >= 0x0030) && (ch <= 0x0039));
}
-
+
inline bool ascii_isLetter( sal_Unicode ch )
{
- return ( ( (ch >= 0x0041) && (ch <= 0x005A) ) ||
+ return ( ( (ch >= 0x0041) && (ch <= 0x005A) ) ||
( (ch >= 0x0061) && (ch <= 0x007A) ) );
}
-
+
inline bool isLetterOrDigit( sal_Unicode ch )
{
return ascii_isLetter( ch ) || ascii_isDigit( ch );
@@ -124,7 +124,7 @@ bool URLParameter::isErrorDocument()
rtl::OString URLParameter::getByName( const char* par )
{
rtl::OUString val;
-
+
if( strcmp( par,"Program" ) == 0 )
val = get_program();
else if( strcmp( par,"Database" ) == 0 )
@@ -141,7 +141,7 @@ rtl::OString URLParameter::getByName( const char* par )
val = get_system();
else if( strcmp( par,"HelpPrefix" ) == 0 )
val = get_prefix();
-
+
return rtl::OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 );
}
@@ -155,13 +155,13 @@ rtl::OUString URLParameter::get_id()
get_language() );
if( inf )
m_aId = inf->get_id();
-
+
m_bStart = true;
}
-
+
return m_aId;
}
-
+
rtl::OUString URLParameter::get_tag()
{
if( isFile() )
@@ -185,16 +185,16 @@ rtl::OUString URLParameter::get_title()
}
else // This must be the root
m_aTitle = rtl::OUString::createFromAscii("root");
-
+
return m_aTitle;
}
-
+
rtl::OUString URLParameter::get_language()
{
if( m_aLanguage.getLength() == 0 )
return m_aDefaultLanguage;
-
+
return m_aLanguage;
}
@@ -211,7 +211,7 @@ rtl::OUString URLParameter::get_program()
}
return m_aProgram;
}
-
+
void URLParameter::init( bool bDefaultLanguageIsInitialized )
{
@@ -220,7 +220,7 @@ void URLParameter::init( bool bDefaultLanguageIsInitialized )
m_bBerkeleyRead = false;
m_bStart = false;
m_bUseDB = true;
- m_nHitCount = 100; // The default maximum hitcount
+ m_nHitCount = 100; // The default maximum hitcount
}
@@ -229,9 +229,9 @@ rtl::OUString URLParameter::get_the_tag()
if(m_bUseDB) {
if( ! m_bBerkeleyRead )
readBerkeley();
-
+
m_bBerkeleyRead = true;
-
+
return m_aTag;
}
else
@@ -246,14 +246,14 @@ rtl::OUString URLParameter::get_the_path()
if( ! m_bBerkeleyRead )
readBerkeley();
m_bBerkeleyRead = true;
-
+
return m_aPath;
}
else
return get_id();
}
-
+
rtl::OUString URLParameter::get_the_title()
{
@@ -261,7 +261,7 @@ rtl::OUString URLParameter::get_the_title()
if( ! m_bBerkeleyRead )
readBerkeley();
m_bBerkeleyRead = true;
-
+
return m_aTitle;
}
else
@@ -275,7 +275,7 @@ rtl::OUString URLParameter::get_the_jar()
if( ! m_bBerkeleyRead )
readBerkeley();
m_bBerkeleyRead = true;
-
+
return m_aJar;
}
else
@@ -312,7 +312,7 @@ void URLParameter::readBerkeley()
break;
rtl::OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 );
-
+
DBHelp* pDBHelp = db->getDBHelp();
if( pDBHelp != NULL )
{
@@ -371,60 +371,60 @@ class InputStreamTransformer
public XSeekable
{
public:
-
+
InputStreamTransformer( URLParameter* urlParam,
Databases* pDatatabases,
bool isRoot = false );
-
+
~InputStreamTransformer();
-
+
virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException );
virtual void SAL_CALL acquire( void ) throw();
virtual void SAL_CALL release( void ) throw();
- virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
+ virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException);
-
+
virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException);
-
+
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException );
-
+
virtual sal_Int32 SAL_CALL available( void ) throw( NotConnectedException,
IOException,
RuntimeException );
-
+
virtual void SAL_CALL closeInput( void ) throw( NotConnectedException,
IOException,
RuntimeException );
-
+
virtual void SAL_CALL seek( sal_Int64 location ) throw( IllegalArgumentException,
IOException,
RuntimeException );
-
+
virtual sal_Int64 SAL_CALL getPosition( void ) throw( IOException,RuntimeException );
-
+
virtual sal_Int64 SAL_CALL getLength( void ) throw( IOException,RuntimeException );
-
+
void addToBuffer( const char* buffer,int len );
sal_Int8* getData() const { return (sal_Int8*) buffer; }
sal_Int32 getLen() const { return sal_Int32( len ); }
-
+
private:
-
+
osl::Mutex m_aMutex;
-
+
int len,pos;
char *buffer;
};
@@ -444,14 +444,14 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
if( ! xDataSink.is() )
return;
-
+
if( isPicture() )
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
get_language() );
-
+
rtl::OUString path = get_path();
if( xNA.is() )
{
@@ -488,7 +488,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
}
else
{
- // a standard document or else an active help text, plug in the new input stream
+ // a standard document or else an active help text, plug in the new input stream
InputStreamTransformer* p = new InputStreamTransformer( this,m_pDatabases,isRoot() );
try
{
@@ -521,7 +521,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
get_language() );
-
+
rtl::OUString path = get_path();
if( xNA.is() )
{
@@ -543,7 +543,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
#endif
}
else
- // a standard document or else an active help text, plug in the new input stream
+ // a standard document or else an active help text, plug in the new input stream
xDataSink->setInputStream( new InputStreamTransformer( this,m_pDatabases,isRoot() ) );
}
@@ -552,11 +552,11 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio
{
// fprintf(stdout,"url send to xmlhelp: %s\n",(rtl::OUStringToOString(m_aURL,RTL_TEXTENCODING_UTF8).getStr()));
m_aExpr = m_aURL;
-
+
sal_Int32 lstIdx = m_aExpr.lastIndexOf( sal_Unicode( '#' ) );
if( lstIdx != -1 )
m_aExpr = m_aExpr.copy( 0,lstIdx );
-
+
if( ! scheme() ||
! name( module() ) ||
! query() ||
@@ -564,7 +564,7 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio
! m_aSystem.getLength() )
throw com::sun::star::ucb::IllegalIdentifierException();
}
-
+
bool URLParameter::scheme()
{
@@ -596,14 +596,14 @@ bool URLParameter::scheme()
return false;
}
-
+
bool URLParameter::module()
{
sal_Int32 idx = 0,length = m_aExpr.getLength();
-
- while( idx < length && isLetterOrDigit( (m_aExpr.getStr())[idx] ) )
+
+ while( idx < length && isLetterOrDigit( (m_aExpr.getStr())[idx] ) )
++idx;
-
+
if( idx != 0 )
{
m_aModule = m_aExpr.copy( 0,idx );
@@ -613,24 +613,24 @@ bool URLParameter::module()
else
return false;
}
-
-
-
+
+
+
bool URLParameter::name( bool modulePresent )
{
// if modulepresent, a name may be present, but must not
sal_Int32 length = m_aExpr.getLength();
-
+
if( length != 0 && (m_aExpr.getStr())[0] == sal_Unicode( '/' ) )
{
sal_Int32 idx = 1;
while( idx < length && (m_aExpr.getStr())[idx] != '?' )
-// ( isLetterOrDigit( (m_aExpr.getStr())[idx] )
+// ( isLetterOrDigit( (m_aExpr.getStr())[idx] )
// || (m_aExpr.getStr())[idx] == '/'
// || (m_aExpr.getStr())[idx] == '.' ))
++idx;
-
+
if( idx != 1 && ! modulePresent )
return false;
else
@@ -639,28 +639,28 @@ bool URLParameter::name( bool modulePresent )
m_aExpr = m_aExpr.copy( idx );
}
}
-
+
// fprintf(stdout,"id %s\n",(rtl::OUStringToOString(m_aId,RTL_TEXTENCODING_UTF8).getStr()));
return true;
}
-
-
+
+
bool URLParameter::query()
{
rtl::OUString query_;
-
+
if( ! m_aExpr.getLength() )
return true;
else if( (m_aExpr.getStr())[0] == sal_Unicode( '?' ) )
query_ = m_aExpr.copy( 1 ).trim();
else
return false;
-
-
+
+
bool ret = true;
sal_Int32 delimIdx,equalIdx;
rtl::OUString parameter,value;
-
+
while( query_.getLength() != 0 )
{
delimIdx = query_.indexOf( sal_Unicode( '&' ) );
@@ -676,7 +676,7 @@ bool URLParameter::query()
value = query_.copy( equalIdx+1,delimIdx - equalIdx - 1 ).trim();
query_ = query_.copy( delimIdx+1 ).trim();
}
-
+
if( parameter.compareToAscii( "Language" ) == 0 )
m_aLanguage = value;
else if( parameter.compareToAscii( "Device" ) == 0 )
@@ -690,7 +690,7 @@ bool URLParameter::query()
else if( parameter.compareToAscii( "DbPAR" ) == 0 )
m_aDbPar = value;
else if( parameter.compareToAscii( "Query" ) == 0 )
- {
+ {
if( ! m_aQuery.getLength() )
m_aQuery = value;
else
@@ -712,12 +712,12 @@ bool URLParameter::query()
else
ret = false;
}
-
+
return ret;
}
struct UserData {
-
+
UserData( InputStreamTransformer* pTransformer,
URLParameter* pInitial,
Databases* pDatabases )
@@ -726,7 +726,7 @@ struct UserData {
m_pInitial( pInitial )
{
}
-
+
InputStreamTransformer* m_pTransformer;
Databases* m_pDatabases;
URLParameter* m_pInitial;
@@ -795,7 +795,7 @@ zipOpen(const char * /*URI*/) {
{
}
}
-
+
if( xInputStream.is() )
{
return new Reference<XInputStream>(xInputStream);
@@ -809,7 +809,7 @@ helpOpen(const char * URI) {
URLParameter urlpar( rtl::OUString::createFromAscii( URI ),
ugblData->m_pDatabases );
-
+
jar = urlpar.get_jar();
language = urlpar.get_language();
path = urlpar.get_path();
@@ -832,7 +832,7 @@ helpOpen(const char * URI) {
{
}
}
-
+
if( xInputStream.is() )
return new Reference<XInputStream>(xInputStream);
return 0;
@@ -901,7 +901,7 @@ extern "C" void StructuredXMLErrorFunction(void *userData, xmlErrorPtr error)
(void)error;
// Reset error handler
- xmlSetStructuredErrorFunc( NULL, NULL );
+ xmlSetStructuredErrorFunc( NULL, NULL );
}
*/
@@ -931,13 +931,13 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
else
{
UserData userData( this,urlParam,pDatabases );
-
+
// Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array
-
+
const char* parameter[47];
rtl::OString parString[46];
int last = 0;
-
+
parString[last++] = "Program";
rtl::OString aPureProgramm( urlParam->getByName( "Program" ) );
parString[last++] = rtl::OString('\'') + aPureProgramm + rtl::OString('\'');
@@ -960,7 +960,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
pDatabases->getProductName().getLength(),
RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
parString[last++] = "productversion";
- parString[last++] = rtl::OString('\'') +
+ parString[last++] = rtl::OString('\'') +
rtl::OString( pDatabases->getProductVersion().getStr(),
pDatabases->getProductVersion().getLength(),
RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
@@ -969,7 +969,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\'');
parString[last++] = "hp";
parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\'');
-
+
if( parString[last-1].getLength() )
{
parString[last++] = "sm";
@@ -996,7 +996,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
parString[last++] = "vendorshort";
parString[last++] = rtl::OString("''");
}
-
+
// Do we need to add extension path?
::rtl::OUString aExtensionPath;
rtl::OUString aJar = urlParam->get_jar();
@@ -1057,10 +1057,10 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
for( int i = 0; i < last; ++i )
parameter[i] = parString[i].getStr();
parameter[last] = 0;
-
+
rtl::OUString xslURL = pDatabases->getInstallPathAsURL();
-
- rtl::OString xslURLascii(
+
+ rtl::OString xslURLascii(
xslURL.getStr(),
xslURL.getLength(),
RTL_TEXTENCODING_UTF8);
@@ -1072,9 +1072,9 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
xmlRegisterInputCallbacks(zipMatch, zipOpen, zipRead, uriClose);
xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
xmlRegisterInputCallbacks(fileMatch, fileOpen, fileRead, fileClose);
- //xmlSetStructuredErrorFunc( NULL, (xmlStructuredErrorFunc)StructuredXMLErrorFunction );
+ //xmlSetStructuredErrorFunc( NULL, (xmlStructuredErrorFunc)StructuredXMLErrorFunction );
- xsltStylesheetPtr cur =
+ xsltStylesheetPtr cur =
xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
xmlDocPtr doc = xmlParseFile("vnd.sun.star.zip:/");
@@ -1109,7 +1109,7 @@ Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw(
Any aRet = ::cppu::queryInterface( rType,
SAL_STATIC_CAST( XInputStream*,this ),
SAL_STATIC_CAST( XSeekable*,this ) );
-
+
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
@@ -1142,13 +1142,13 @@ sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aDat
curr = nBytesToRead;
else
curr = available_;
-
+
if( 0 <= curr && aData.getLength() < curr )
- aData.realloc( curr );
-
+ aData.realloc( curr );
+
for( int k = 0; k < curr; ++k )
aData[k] = buffer[pos++];
-
+
return curr > 0 ? curr : 0;
}
@@ -1202,7 +1202,7 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA
throw IllegalArgumentException();
else
pos = sal::static_int_cast<sal_Int32>( location );
-
+
if( pos > len )
pos = len;
}
@@ -1221,7 +1221,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOExceptio
sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
-
+
return len;
}
@@ -1229,7 +1229,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,
void InputStreamTransformer::addToBuffer( const char* buffer_,int len_ )
{
osl::MutexGuard aGuard( m_aMutex );
-
+
char* tmp = buffer;
buffer = new char[ len+len_ ];
rtl_copyMemory( (void*)(buffer),(void*)(tmp),sal_uInt32( len ) );
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 8a9aacc..356115e 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -31,7 +31,7 @@
#include <string.h>
#include <rtl/ustrbuf.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include "tvread.hxx"
#include <expat.h>
#include <osl/file.hxx>
@@ -48,14 +48,14 @@
namespace treeview {
-
+
class TVDom
{
friend class TVChildTarget;
friend class TVRead;
-
+
public:
-
+
TVDom( TVDom* arent = 0 )
: kind( other ),
parent( arent ),
@@ -68,15 +68,15 @@ namespace treeview {
for( unsigned i = 0; i < childs.size(); ++i )
delete childs[i];
}
-
-
+
+
TVDom* newChild()
{
childs.push_back( new TVDom( this ) );
return childs.back();
}
-
-
+
+
TVDom* getParent() const
{
if( parent )
@@ -91,39 +91,39 @@ namespace treeview {
tree_leaf,
other
};
-
+
bool isLeaf() const { return kind == TVDom::tree_leaf; }
void setKind( Kind ind ) { kind = ind; }
Kind getKind( ) const { return kind; }
-
-
+
+
void setApplication( const char* appl )
{
application = rtl::OUString( (sal_Char*)(appl),
strlen( appl ),
RTL_TEXTENCODING_UTF8 );
}
-
+
void setTitle( const char* itle )
{
title += rtl::OUString( (sal_Char*)(itle),
strlen( itle ),
RTL_TEXTENCODING_UTF8 );
}
-
+
void setTitle( const XML_Char* itle,int len )
{
title += rtl::OUString( (sal_Char*)(itle),
len,
RTL_TEXTENCODING_UTF8 );
}
-
+
void setId( const char* d )
{
id = rtl::OUString( (sal_Char*)(d),
strlen( d ),
RTL_TEXTENCODING_UTF8 );
- }
+ }
void setAnchor( const char* nchor )
{
@@ -143,27 +143,27 @@ namespace treeview {
if ( len != 0 )
break;
}
-
+
rtl::OUStringBuffer strBuff( 22 + len + id.getLength() );
strBuff.appendAscii(
"vnd.sun.star.help://"
).append(id);
-
+
targetURL = strBuff.makeStringAndClear();
}
-
+
return targetURL;
}
-
+
private:
-
+
Kind kind;
rtl::OUString application;
rtl::OUString title;
rtl::OUString id;
rtl::OUString anchor;
rtl::OUString targetURL;
-
+
TVDom *parent;
std::vector< TVDom* > childs;
};
@@ -197,7 +197,7 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const
sal_Int32 idx = -1,k = 0,off;
bool cap = false;
rtl::OUStringBuffer aStrBuf( 0 );
-
+
while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 )
{
if( oustring.indexOf( prodName,idx ) == idx )
@@ -212,7 +212,7 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const
off = VENDORSHORT;
else
off = -1;
-
+
if( off != -1 )
{
if( ! cap )
@@ -220,13 +220,13 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const
cap = true;
aStrBuf.ensureCapacity( 256 );
}
-
+
aStrBuf.append( &oustring.getStr()[k],idx - k );
aStrBuf.append( m_vReplacement[off] );
k = idx + m_vAdd[off];
}
}
-
+
if( cap )
{
if( k < oustring.getLength() )
@@ -272,7 +272,7 @@ TVBase::queryInterface(
SAL_STATIC_CAST( XHierarchicalNameAccess*, this ),
SAL_STATIC_CAST( XChangesNotifier*, this ),
SAL_STATIC_CAST( XComponent*, this ) );
-
+
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
@@ -300,7 +300,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{
if( ! tvDom )
return;
-
+
Title = tvDom->title;
configData.replaceName( Title );
if( tvDom->isLeaf() )
@@ -340,13 +340,13 @@ TVRead::getByName( const rtl::OUString& aName )
else if( aName.compareToAscii( "TargetURL" ) == 0 )
aAny <<= TargetURL;
else if( aName.compareToAscii( "Children" ) == 0 )
- {
+ {
cppu::OWeakObject* p = Children.get();
aAny <<= Reference< XInterface >( p );
}
else
found = false;
-
+
if( found )
return aAny;
@@ -361,7 +361,7 @@ TVRead::getElementNames( )
throw( RuntimeException )
{
Sequence< rtl::OUString > seq( 3 );
-
+
seq[0] = rtl::OUString::createFromAscii( "Title" );
seq[1] = rtl::OUString::createFromAscii( "TargetURL" );
seq[2] = rtl::OUString::createFromAscii( "Children" );
@@ -379,7 +379,7 @@ TVRead::hasByName( const rtl::OUString& aName )
aName.compareToAscii( "TargetURL" ) == 0 ||
aName.compareToAscii( "Children" ) == 0 )
return true;
-
+
return false;
}
@@ -393,11 +393,11 @@ TVRead::getByHierarchicalName( const rtl::OUString& aName )
{
sal_Int32 idx;
rtl::OUString name( aName );
-
+
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 &&
name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
return Children->getByHierarchicalName( name.copy( 1 + idx ) );
-
+
return getByName( name );
}
@@ -410,11 +410,11 @@ TVRead::hasByHierarchicalName( const rtl::OUString& aName )
{
sal_Int32 idx;
rtl::OUString name( aName );
-
+
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 &&
name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
return Children->hasByHierarchicalName( name.copy( 1 + idx ) );
-
+
return hasByName( name );
}
@@ -432,9 +432,9 @@ TVRead::hasByHierarchicalName( const rtl::OUString& aName )
extern "C" void start_handler(void *userData,
const XML_Char *name,
const XML_Char **atts)
-{
+{
TVDom::Kind kind;
-
+
if( strcmp( name,"help_section" ) == 0 ||
strcmp( name,"node" ) == 0 )
kind = TVDom::tree_node;
@@ -442,14 +442,14 @@ extern "C" void start_handler(void *userData,
kind = TVDom::tree_leaf;
else
return;
-
+
TVDom **tvDom = static_cast< TVDom** >( userData );
TVDom *p;
p = *tvDom;
*tvDom = p->newChild();
p = *tvDom;
-
+
p->setKind( kind );
while( *atts )
{
@@ -461,7 +461,7 @@ extern "C" void start_handler(void *userData,
p->setId( *(atts+1) );
else if( strcmp( *atts,"anchor" ) == 0 )
p->setAnchor( *(atts+1) );
-
+
atts+=2;
}
}
@@ -494,22 +494,22 @@ TVChildTarget::TVChildTarget( const ConfigData& configData,TVDom* tvDom )
for( unsigned i = 0; i < Elements.size(); ++i )
Elements[i] = new TVRead( configData,tvDom->childs[i] );
}
-
-
+
+
TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
-{
+{
ConfigData configData = init( xMSF );
if( ! configData.locale.getLength() ||
! configData.system.getLength() )
return;
-
+
sal_uInt64 ret,len = 0;
int j = configData.vFileURL.size();
-
+
TVDom tvDom;
TVDom* pTVDom = &tvDom;
@@ -521,7 +521,7 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
aFile.open( OpenFlag_Read );
aFile.read( s,len,ret );
aFile.close();
-
+
XML_Parser parser = XML_ParserCreate( 0 );
XML_SetElementHandler( parser,
start_handler,
@@ -529,15 +529,15 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
XML_SetCharacterDataHandler( parser,
data_handler);
XML_SetUserData( parser,&pTVDom ); // does not return this
-
+
int parsed = XML_Parse( parser,s,int( len ),j==0 );
(void)parsed;
OSL_ENSURE( parsed, "TVChildTarget::TVChildTarget(): Tree file parsing failed" );
-
- XML_ParserFree( parser );
+
+ XML_ParserFree( parser );
delete[] s;
- }
-
+ }
+
// now TVDom holds the relevant information
Elements.resize( tvDom.childs.size() );
@@ -558,11 +558,11 @@ TVChildTarget::getByName( const rtl::OUString& aName )
WrappedTargetException,
RuntimeException )
{
- rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
+ rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
if( idx < 0 || Elements.size() <= sal_uInt32( idx ) )
throw NoSuchElementException();
-
+
Any aAny;
cppu::OWeakObject* p = Elements[idx].get();
aAny <<= Reference< XInterface >( p );
@@ -579,7 +579,7 @@ TVChildTarget::getElementNames( )
Sequence< rtl::OUString > seq( Elements.size() );
for( unsigned i = 0; i < Elements.size(); ++i )
seq[i] = rtl::OUString::valueOf( sal_Int32( 1+i ) );
-
+
return seq;
}
@@ -589,11 +589,11 @@ sal_Bool SAL_CALL
TVChildTarget::hasByName( const rtl::OUString& aName )
throw( RuntimeException )
{
- rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
+ rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
if( idx < 0 || Elements.size() <= sal_uInt32( idx ) )
return false;
-
+
return true;
}
@@ -608,15 +608,15 @@ TVChildTarget::getByHierarchicalName( const rtl::OUString& aName )
{
sal_Int32 idx;
rtl::OUString name( aName );
-
+
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 )
{
- rtl::OUString num( name.getStr()+2,idx-4 );
+ rtl::OUString num( name.getStr()+2,idx-4 );
sal_Int32 pref = num.toInt32() - 1;
-
+
if( pref < 0 || Elements.size() <= sal_uInt32( pref ) )
throw NoSuchElementException();
-
+
return Elements[pref]->getByHierarchicalName( name.copy( 1 + idx ) );
}
else
@@ -631,14 +631,14 @@ TVChildTarget::hasByHierarchicalName( const rtl::OUString& aName )
{
sal_Int32 idx;
rtl::OUString name( aName );
-
+
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 )
{
rtl::OUString num( name.getStr()+2,idx-4 );
- sal_Int32 pref = num.toInt32() - 1;
+ sal_Int32 pref = num.toInt32() - 1;
if( pref < 0 || Elements.size() <= sal_uInt32( pref ) )
return false;
-
+
return Elements[pref]->hasByHierarchicalName( name.copy( 1 + idx ) );
}
else
@@ -654,20 +654,20 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
{
ConfigData configData;
Reference< XMultiServiceFactory > sProvider( getConfiguration(xSMgr) );
-
+
/**********************************************************************/
/* reading Office.Common */
/**********************************************************************/
-
+
Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider,
"org.openoffice.Office.Common" ) );
- rtl::OUString system( getKey( xHierAccess,"Help/System" ) );
+ rtl::OUString system( getKey( xHierAccess,"Help/System" ) );
sal_Bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") );
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( ! instPath.getLength() )
// try to determine path from default
instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
-
+
// replace anything like $(instpath);
subst( xSMgr,instPath );
@@ -677,7 +677,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
xHierAccess = getHierAccess( sProvider,
"org.openoffice.Setup" );
-
+
rtl::OUString productName( getKey( xHierAccess,"Product/ooName" ) );
rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) );
rtl::OUString setupextension;
@@ -707,12 +707,12 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
{
}
- rtl::OUString productVersion( setupversion +
+ rtl::OUString productVersion( setupversion +
rtl::OUString::createFromAscii( " " ) +
setupextension );
rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
-
+
// Determine fileurl from url and locale
rtl::OUString url;
osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
@@ -735,7 +735,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
ret = rtl::OUString::createFromAscii("en");
}
url = url + ret;
-
+
// first of all, try do determine whether there are any *.tree files present
// Start with extensions to set them at the end of the list
@@ -756,7 +756,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
rtl::OUString aFileUrl, aFileName;
while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None &&
aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
- aFileStatus.isValid( FileStatusMask_FileURL ) &&
+ aFileStatus.isValid( FileStatusMask_FileURL ) &&
aFileStatus.isValid( FileStatusMask_FileName ) )
{
aFileUrl = aFileStatus.getFileURL();
@@ -764,22 +764,22 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
idx_ = aFileName.lastIndexOf( sal_Unicode( '.' ) );
if( idx_ == -1 )
continue;
-
+
const sal_Unicode* str = aFileName.getStr();
-
- if( aFileName.getLength() == idx_ + 5 &&
- ( str[idx_ + 1] == 't' || str[idx_ + 1] == 'T' ) &&
+
+ if( aFileName.getLength() == idx_ + 5 &&
+ ( str[idx_ + 1] == 't' || str[idx_ + 1] == 'T' ) &&
( str[idx_ + 2] == 'r' || str[idx_ + 2] == 'R' ) &&
( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' ) &&
( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) )
{
OSL_ENSURE( aFileStatus.isValid( FileStatusMask_FileSize ),
- "invalid file size" );
-
+ "invalid file size" );
+
rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
continue;
-
+
configData.vFileLen.push_back( aFileStatus.getFileSize() );
configData.vFileURL.push_back( aFileUrl );
}
@@ -797,14 +797,14 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
// m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
configData.system = system;
- configData.locale = locale;
+ configData.locale = locale;
configData.appendix =
rtl::OUString::createFromAscii( "?Language=" ) +
configData.locale +
rtl::OUString::createFromAscii( "&System=" ) +
configData.system +
rtl::OUString::createFromAscii( "&UseDB=no" ) ;
-
+
return configData;
}
@@ -836,7 +836,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr
OSL_ENSURE( sProvider.is(),"cant instantiate configuration" );
}
}
-
+
return sProvider;
}
@@ -847,18 +847,18 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
const char* file ) const
{
Reference< XHierarchicalNameAccess > xHierAccess;
-
+
if( sProvider.is() )
{
Sequence< Any > seq(1);
rtl::OUString sReaderService =
rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" );
-
- seq[0] <<= rtl::OUString::createFromAscii( file );
-
+
+ seq[0] <<= rtl::OUString::createFromAscii( file );
+
try
{
- xHierAccess =
+ xHierAccess =
Reference< XHierarchicalNameAccess >
( sProvider->createInstanceWithArguments( sReaderService,seq ),
UNO_QUERY );
@@ -867,7 +867,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
{
}
}
-
+
return xHierAccess;
}
@@ -937,9 +937,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
OSL_ENSURE( xCfgMgr.is()," cant instantiate the special config manager " );
}
}
-
+
OSL_ENSURE( xCfgMgr.is(), "specialconfigmanager not found\n" );
-
+
if( xCfgMgr.is() )
instpath = xCfgMgr->substituteVariables( instpath );
}
@@ -978,7 +978,7 @@ void ExtensionIteratorBase::init()
}
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
- m_xSFA = Reference< ucb::XSimpleFileAccess >(
+ m_xSFA = Reference< ucb::XSimpleFileAccess >(
xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW );
@@ -1065,7 +1065,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
{
const Reference< deployment::XPackage >* pUserPackages = m_aUserPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pUserPackages[ m_iUserPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextUserHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextUserHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1095,7 +1095,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
{
const Reference< deployment::XPackage >* pSharedPackages = m_aSharedPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pSharedPackages[ m_iSharedPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextSharedHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextSharedHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1125,7 +1125,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
{
const Reference< deployment::XPackage >* pBundledPackages = m_aBundledPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pBundledPackages[ m_iBundledPackage++ ];
- VOS_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextBundledHelpPackage(): Invalid package" );
+ OSL_ENSURE( xPackage.is(), "ExtensionIteratorBase::implGetNextBundledHelpPackage(): Invalid package" );
xHelpPackage = implGetHelpPackageFromPackage( xPackage, o_xParentPackageBundle );
}
@@ -1215,7 +1215,7 @@ rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
}
case END_REACHED:
- VOS_ENSURE( false, "DataBaseIterator::nextTreeFile(): Invalid case END_REACHED" );
+ OSL_ENSURE( false, "DataBaseIterator::nextTreeFile(): Invalid case END_REACHED" );
break;
}
}
More information about the Libreoffice-commits
mailing list