diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-05 17:19:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-05 18:31:20 +0200 |
| commit | 5926b22b5dc33490d23d594b129eb8a70b94ffb0 (patch) | |
| tree | 366bf4c969c0a7118c95dae249de74bc4f866d74 /canvas/source/opengl | |
| parent | 623c0cff7589e3f2298c16c7402cf160b99fabe2 (diff) | |
The SystemEnvData passed into the canvas factories appears to be unused
It was passed in as aArg[1] ever since d551190e8311242eadda4a3e82efff160175cb04
"INTEGRATION: CWS canvas05", but I can't find any current use of that specific
argument in canvas/source/ (assuming that all the factories are implemented
there), nor can I find any trace in the git history of it ever havig been used.
That means that Window::GetSystemDataAny is unused now and can be removed.
Change-Id: I16efe548afb5cc3e0606cffea135f7e6674d5def
Reviewed-on: https://gerrit.libreoffice.org/80295
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'canvas/source/opengl')
| -rw-r--r-- | canvas/source/opengl/ogl_spritecanvas.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 0bed1cac8565..13fd6ec49c63 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -50,25 +50,24 @@ namespace oglcanvas /* aArguments: 0: ptr to creating instance (Window or VirtualDevice) - 1: SystemEnvData as a streamed Any (or empty for VirtualDevice) - 2: current bounds of creating instance - 3: bool, denoting always on top state for Window (always false for VirtualDevice) - 4: XWindow for creating Window (or empty for VirtualDevice) - 5: SystemGraphicsData as a streamed Any + 1: current bounds of creating instance + 2: bool, denoting always on top state for Window (always false for VirtualDevice) + 3: XWindow for creating Window (or empty for VirtualDevice) + 4: SystemGraphicsData as a streamed Any */ - ENSURE_ARG_OR_THROW( maArguments.getLength() >= 5 && - maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, + ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 && + maArguments[3].getValueTypeClass() == uno::TypeClass_INTERFACE, "OpenGL SpriteCanvas::initialize: wrong number of arguments, or wrong types" ); uno::Reference< awt::XWindow > xParentWindow; - maArguments[4] >>= xParentWindow; + maArguments[3] >>= xParentWindow; VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", nullptr); awt::Rectangle aRect; - maArguments[2] >>= aRect; + maArguments[1] >>= aRect; // setup helper maDeviceHelper.init( *pParentWindow, |