Kaydet (Commit) b11de026 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove duplicate ImplGetAppSVData and GetAppSalData

Change-Id: I8cb241898e22251656de4e080f1ae9bfe0359383
üst 76cc3cf6
...@@ -129,7 +129,6 @@ public: ...@@ -129,7 +129,6 @@ public:
inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; } inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
inline SalData *GetAppSalData() { return ImplGetAppSVData()->mpSalData; }
// --- Prototypes --- // --- Prototypes ---
......
...@@ -113,7 +113,6 @@ public: ...@@ -113,7 +113,6 @@ public:
inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; } inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
inline SalData *GetAppSalData() { return ImplGetAppSVData()->mpSalData; }
// --- Prototypes --- // --- Prototypes ---
......
...@@ -395,7 +395,6 @@ long ImplCallEvent( NotifyEvent& rEvt ); ...@@ -395,7 +395,6 @@ long ImplCallEvent( NotifyEvent& rEvt );
extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData; extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
inline ImplSVData* ImplGetAppSVData() { return ImplGetSVData(); }
VCL_PLUGIN_PUBLIC void ImplHideSplash(); VCL_PLUGIN_PUBLIC void ImplHideSplash();
bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled );
......
...@@ -149,7 +149,6 @@ public: ...@@ -149,7 +149,6 @@ public:
inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
inline SalData* GetSalData() { return ImplGetSVData()->mpSalData; } inline SalData* GetSalData() { return ImplGetSVData()->mpSalData; }
inline SalData* GetAppSalData() { return ImplGetAppSVData()->mpSalData; }
// -------------- // --------------
// - SalShlData - // - SalShlData -
......
...@@ -468,7 +468,7 @@ void DeInitSalData() ...@@ -468,7 +468,7 @@ void DeInitSalData()
void InitSalMain() void InitSalMain()
{ {
// remember data, copied from WinMain // remember data, copied from WinMain
SalData* pData = GetAppSalData(); SalData* pData = GetSalData();
if ( pData ) // Im AppServer NULL if ( pData ) // Im AppServer NULL
{ {
STARTUPINFO aSI; STARTUPINFO aSI;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment