diff options
Diffstat (limited to 'vcl/unx/gtk/app/gtksys.cxx')
| -rw-r--r-- | vcl/unx/gtk/app/gtksys.cxx | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index cc921b87fb4f..b7996c110ae1 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -1,32 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * This file is part of the LibreOffice project. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * This file incorporates work covered by the following license notice: * - * The Initial Developer of the Original Code is - * Michael Meeks <michael.meeks@novell.com> - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. - * - * Major Contributor(s): - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #include <string.h> #include <gmodule.h> #include <gtk/gtk.h> @@ -118,9 +108,8 @@ SalX11Screen GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen) { gint nMonitor; - GdkScreen *pScreen = NULL; - pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); + GdkScreen *pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) return SalX11Screen (0); #if GTK_CHECK_VERSION(3,0,0) |