diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-23 18:06:39 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-23 18:06:39 +0100 |
commit | d67e92069b9fb109e33a5133326eef51bf99aeb8 (patch) | |
tree | 8e403c695b28b8ba6adf2dc305a5c62388f7ae01 /vcl/inc/svdata.hxx | |
parent | 4617694b3fd830c8560f8d75d5f6afca618a8d65 (diff) | |
parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) |
vcl2gnumake: rebase to DEV300m103
Diffstat (limited to 'vcl/inc/svdata.hxx')
-rw-r--r-- | vcl/inc/svdata.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 24d85c873572..9c91915823b2 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -28,6 +28,7 @@ #ifndef _SV_SVDATA_HXX #define _SV_SVDATA_HXX +#include "rtl/ref.hxx" #include "vos/thread.hxx" #include "tools/string.hxx" #include "tools/gen.hxx" @@ -42,6 +43,8 @@ #include "com/sun/star/uno/Reference.hxx" #include "unotools/options.hxx" +#include <hash_map> + namespace com { namespace sun { namespace star { @@ -51,9 +54,6 @@ namespace lang { namespace frame { class XSessionManagerClient; } -namespace awt { - class XDisplayConnection; -} }}} struct ImplTimerData; @@ -361,21 +361,21 @@ struct ImplSVData sal_Bool mbIsTestTool; vos::OThread::TThreadIdentifier mnMainThreadId; - ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XDisplayConnection > mxDisplayConnection; + rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge; com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; + std::hash_map< int, rtl::OUString >* mpPaperNames; }; void ImplInitSVData(); void ImplDeInitSVData(); void ImplDestroySVData(); Window* ImplGetDefaultWindow(); -VCL_DLLPUBLIC ResMgr* ImplGetResMgr(); -VCL_DLLPUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr +VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr(); +VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr DockingManager* ImplGetDockingManager(); void ImplWindowAutoMnemonic( Window* pWindow ); @@ -391,8 +391,8 @@ void ImplFreeEventHookData(); long ImplCallPreNotify( NotifyEvent& rEvt ); long ImplCallEvent( NotifyEvent& rEvt ); -extern VCL_DLLPUBLIC ImplSVData* pImplSVData; -inline VCL_DLLPUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } +extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData; +inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } inline ImplSVData* ImplGetAppSVData() { return ImplGetSVData(); } bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); |