diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-18 18:21:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-20 14:44:03 +0200 |
| commit | b11de026cb8eb520dc410fd974581e780ecbef92 (patch) | |
| tree | b1967aa8b7558b8fd18c5531ee6e09468dc98834 | |
| parent | 76cc3cf62162432afe2a34502a950654e7c3a48c (diff) | |
Remove duplicate ImplGetAppSVData and GetAppSalData
Change-Id: I8cb241898e22251656de4e080f1ae9bfe0359383
| -rw-r--r-- | vcl/inc/aqua/saldata.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/ios/saldata.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 1 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 2 |
5 files changed, 1 insertions, 5 deletions
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx index 7339d5c14328..e9023bec816f 100644 --- a/vcl/inc/aqua/saldata.hxx +++ b/vcl/inc/aqua/saldata.hxx @@ -129,7 +129,6 @@ public: inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; } -inline SalData *GetAppSalData() { return ImplGetAppSVData()->mpSalData; } // --- Prototypes --- diff --git a/vcl/inc/ios/saldata.hxx b/vcl/inc/ios/saldata.hxx index a15d4e82664e..eca863a35a6a 100644 --- a/vcl/inc/ios/saldata.hxx +++ b/vcl/inc/ios/saldata.hxx @@ -113,7 +113,6 @@ public: inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; } -inline SalData *GetAppSalData() { return ImplGetAppSVData()->mpSalData; } // --- Prototypes --- diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 1d951fdaea7a..8aa5f8732ec1 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -395,7 +395,6 @@ long ImplCallEvent( NotifyEvent& rEvt ); extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData; inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } -inline ImplSVData* ImplGetAppSVData() { return ImplGetSVData(); } VCL_PLUGIN_PUBLIC void ImplHideSplash(); bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 8195001364c5..ce3870e9712d 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -149,7 +149,6 @@ public: inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } inline SalData* GetSalData() { return ImplGetSVData()->mpSalData; } -inline SalData* GetAppSalData() { return ImplGetAppSVData()->mpSalData; } // -------------- // - SalShlData - diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index f5f678b61e0b..b63d65874fa3 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -468,7 +468,7 @@ void DeInitSalData() void InitSalMain() { // remember data, copied from WinMain - SalData* pData = GetAppSalData(); + SalData* pData = GetSalData(); if ( pData ) // Im AppServer NULL { STARTUPINFO aSI; |