[Libreoffice-commits] core.git: vcl/inc vcl/ios

Tor Lillqvist tml at collabora.com
Mon May 26 06:13:55 PDT 2014


 vcl/inc/saldatabasic.hxx |    2 ++
 vcl/ios/iosinst.cxx      |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 231050ddcc8a286baf4e27e4858b2d7712ac22cc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 26 16:04:26 2014 +0300

    No need for these fields for iOS
    
    Change-Id: I3fff002919a1f15ae370c7d0c7f65e67108a6232

diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 0c504e4..6803d60 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -39,8 +39,10 @@ class VCL_PLUGIN_PUBLIC SalData
 {
 public:
     SalInstance*                  m_pInstance; // pointer to instance
+#ifndef IOS
     oslModule                     m_pPlugin;   // plugin library handle
     psp::PrinterInfoManager*      m_pPIManager;
+#endif
 
     SalData();
     virtual ~SalData();
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index db7fb0f..af0df03 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -197,8 +197,6 @@ const OUString& SalGetDesktopEnvironment()
 
 SalData::SalData() :
     m_pInstance( 0 ),
-    m_pPlugin( 0 ),
-    m_pPIManager(0 ),
     mpFontList( 0 ),
     mxRGBSpace( CGColorSpaceCreateDeviceRGB() ),
     mxGraySpace( CGColorSpaceCreateDeviceGray() )


More information about the Libreoffice-commits mailing list