diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
commit | 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 (patch) | |
tree | 127c4b92c30f6dcf21b8a121b66a1fdf21a8f9a9 /sfx2 | |
parent | 4ec839be778e5541c09b0f1a6e3b707ca29bae6d (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'sfx2')
35 files changed, 42 insertions, 49 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index ddd024942e..5b2f32a786 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -659,7 +659,7 @@ #include "vcl/wintypes.hxx" #include "osl/diagnose.h" #include "vos/module.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vos/process.hxx" #include "vos/xception.hxx" //---MARKER--- diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx index 5b9ae8cc74..f846ab27ac 100644 --- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx +++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx @@ -36,10 +36,6 @@ #include <cppuhelper/implbase1.hxx> -namespace vos -{ - class IMutex; -} //........................................................................ namespace sfx2 @@ -66,10 +62,10 @@ namespace sfx2 class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base { IModifiableDocument* m_pDocument; - ::vos::IMutex& m_rMutex; + ::osl::SolarMutex& m_rMutex; public: - DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::vos::IMutex& _rMutex ); + DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::osl::SolarMutex& _rMutex ); void dispose(); diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 9fe06190ef..4efec7285b 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -85,7 +85,7 @@ #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <tools/link.hxx> diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 419b9637dc..1814a691a4 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -35,7 +35,7 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 47a82cee1c..b976915223 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/uno/Reference.h> #include <tools/config.hxx> #include <tools/rcid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/frame/XDesktop.hpp> @@ -87,7 +87,6 @@ #include <sfx2/objface.hxx> #include "helper.hxx" // SfxContentHelper::Kill() -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; @@ -165,7 +164,7 @@ void SfxApplication::InitializeDisplayName_Impl() String aTitle = Application::GetDisplayName(); if ( !aTitle.Len() ) { - OClearableGuard aGuard( OMutex::getGlobalMutex() ); + osl::ClearableMutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // create version string /*!!! (pb) don't show a version number at the moment diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 8b68150ec3..2f3311c3b7 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -81,7 +81,7 @@ #include <comphelper/docpasswordhelper.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/logfile.hxx> diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx index 0784a17255..b0f3ffc20c 100644 --- a/sfx2/source/appl/fwkhelper.cxx +++ b/sfx2/source/appl/fwkhelper.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include "sal/config.h" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "workwin.hxx" diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 58dc6914fd..a9993b0b76 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -51,7 +51,7 @@ #include "rtl/ustring.hxx" #include "sal/types.h" #include "vcl/svapp.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" namespace css = com::sun::star; diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 1ca2708fa4..b7e058b27d 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -32,7 +32,7 @@ #include <shutdownicon.hxx> #include <app.hrc> #include <sfx2/app.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/imagemgr.hxx> #include <svtools/miscopt.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -77,7 +77,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui::dialogs; -using namespace ::vos; using namespace ::rtl; using namespace ::sfx2; diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index a3fb6d15c3..8ce1927f80 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -34,7 +34,7 @@ #include "tools/urlobj.hxx" #include "osl/file.h" #include "comphelper/sequenceashashmap.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "sfx2/app.hxx" #include <sal/macros.h> #include "app.hrc" diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 1722d022e1..ab3b2c6bb4 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -9,7 +9,7 @@ #include <gtk/gtk.h> #include <glib.h> #include <eggtray/eggtrayicon.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 77818ade10..57f743d5c2 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -98,7 +98,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; -using namespace ::vos; #include <svl/ctypeitm.hxx> #include <svtools/sfxecode.hxx> #include <unotools/syslocale.hxx> diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 416d9a65a0..a9637faa62 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -42,7 +42,7 @@ #include <sfx2/docfac.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //***************************************************************************************************************** // namespaces diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index c0a330eeec..2627cd82fd 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -38,7 +38,7 @@ #include <svl/visitem.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 7b729af8e1..f79846be44 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -38,7 +38,7 @@ #include <svl/visitem.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 1c75381f9c..c7c5d69f26 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <uno/current_context.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 6428f4d9ab..ab0cff33ac 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -64,7 +64,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/localfilehelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/security.hxx> #include <osl/thread.hxx> #include <vcl/cvtgrf.hxx> @@ -1160,7 +1160,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl() class PickerThread_Impl : public ::osl::Thread { uno::Reference < XFilePicker > mxPicker; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; virtual void SAL_CALL run(); sal_Int16 mnRet; public: @@ -1168,10 +1168,10 @@ public: : mxPicker( rPicker ), mnRet(nMagic) {} sal_Int16 GetReturnValue() - { ::vos::OGuard aGuard( maMutex ); return mnRet; } + { ::osl::MutexGuard aGuard( maMutex ); return mnRet; } void SetReturnValue( sal_Int16 aRetValue ) - { ::vos::OGuard aGuard( maMutex ); mnRet = aRetValue; } + { ::osl::MutexGuard aGuard( maMutex ); mnRet = aRetValue; } }; void SAL_CALL PickerThread_Impl::run() diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index f33ca57b8e..e0c0f87e58 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/system/SimpleMailClientFlags.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <rtl/textench.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 6ad26b7226..f579fec61d 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -31,7 +31,7 @@ #include <sfx2/Metadatable.hxx> #include <sfx2/XmlIdRegistry.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> // solarmutex #include <rtl/random.h> diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx index 39f9553f86..4f874290d0 100644 --- a/sfx2/source/doc/docstoragemodifylistener.cxx +++ b/sfx2/source/doc/docstoragemodifylistener.cxx @@ -30,7 +30,7 @@ #include "precompiled_sfx2.hxx" #include "sfx2/docstoragemodifylistener.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> /** === begin UNO includes === **/ /** === end UNO includes === **/ @@ -57,7 +57,7 @@ namespace sfx2 //= //==================================================================== //-------------------------------------------------------------------- - DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::vos::IMutex& _rMutex ) + DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::osl::SolarMutex& _rMutex ) :m_pDocument( &_rDocument ) ,m_rMutex( _rMutex ) { @@ -71,14 +71,14 @@ namespace sfx2 //-------------------------------------------------------------------- void DocumentStorageModifyListener::dispose() { - ::vos::OGuard aGuard( m_rMutex ); + ::osl::SolarMutexGuard aGuard( m_rMutex ); m_pDocument = NULL; } //-------------------------------------------------------------------- void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) { - ::vos::OGuard aGuard( m_rMutex ); + ::osl::SolarMutexGuard aGuard( m_rMutex ); // storageIsModified must not contain any locking! if ( m_pDocument ) m_pDocument->storageIsModified(); diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index ce13f6e26b..868b52bd71 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 <osl/mutex.hxx> #include <osl/thread.hxx> #include <tools/resary.hxx> diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 0d1f60b0ed..016ea959e5 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -30,7 +30,7 @@ #include "precompiled_sfx2.hxx" #include "doctemplates.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index d37c8a0171..a42d1dba3d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -35,7 +35,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svtools/svparser.hxx> // SvKeyValue -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index fabbb4f451..b54b23365b 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -55,7 +55,7 @@ #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/errcode.hxx> #include <svl/cntwids.hrc> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index b9565de573..914d69009d 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XTitle.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/resary.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index fc1807f582..d6a714c4a5 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -53,7 +53,7 @@ #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/printdlg.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ee9a3c2f85..8f81876e71 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -81,7 +81,7 @@ #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <unotools/tempfile.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/salctype.hxx> #include <sot/clsids.hxx> #include <sot/storinfo.hxx> diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index b8c1adba42..48379b49af 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -52,7 +52,7 @@ #include <comphelper/sequenceasvector.hxx> #include <sfx2/sfxuno.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <svl/lstner.hxx> #include <unotools/eventcfg.hxx> diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 529cf1fd86..a7af06d5c6 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -35,7 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #ifndef DELETEZ #define DELETEZ(pPtr) ( delete pPtr, pPtr = 0 ) diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index eb3b6a9089..2ba75482be 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -39,7 +39,7 @@ #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> // SvUShorts #include <rtl/ustring.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/sfx.hrc> #include <sfx2/childwin.hxx> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 7b3b84b0a3..1e73582411 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -41,7 +41,7 @@ #include <vcl/toolbox.hxx> #include <toolkit/unohlp.hxx> #include <osl/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <svl/itemset.hxx> diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index b5d2192918..169288a1d1 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -45,7 +45,7 @@ #include <tools/rcid.h> #include <tools/link.hxx> #include <svtools/miscopt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index e29afda2d5..982ab59b15 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -76,7 +76,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/simpleinteractionrequest.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> /** === begin UNO using === **/ using ::com::sun::star::beans::PropertyValue; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index b7dd674152..db7fe17533 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -81,7 +81,7 @@ #include <workwin.hxx> #include <sfx2/objface.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <tools/diagnose_ex.h> #include <comphelper/sequence.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0f82ab002c..652470785a 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -50,7 +50,7 @@ #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> #include <unotools/pathoptions.hxx> |