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

Julien Nabet serval2412 at yahoo.fr
Sun Dec 27 02:52:38 PST 2015


 vcl/inc/unx/salinst.h         |    2 +-
 vcl/unx/generic/gdi/salvd.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa2a843c4bf87eefa59263f8691571c097276100
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 27 11:51:55 2015 +0100

    Revert "loplugin:staticmethods"
    
    This reverts commit 4d6742f644970e24dfda7dded9cf63ebeb6c9644.

diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index f651fa2..b650ea0 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -56,7 +56,7 @@ public:
     virtual void                DestroyObject( SalObject* pObject ) override;
 
     /// Gtk vclplug needs to pass GtkSalGraphics to X11SalVirtualDevice, so create it, and pass as pNewGraphics.
-    static SalVirtualDevice* CreateX11VirtualDevice(SalGraphics* pGraphics, long &nDX, long &nDY,
+    SalVirtualDevice* CreateX11VirtualDevice(SalGraphics* pGraphics, long &nDX, long &nDY,
             DeviceFormat eFormat, const SystemGraphicsData* pData, X11SalGraphics* pNewGraphics);
 
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 72f9683..97b1d3b 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -35,7 +35,7 @@
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <opengl/x11/salvd.hxx>
 
-static SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics,
+SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics,
         long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData,
         X11SalGraphics* pNewGraphics)
 {


More information about the Libreoffice-commits mailing list