[Libreoffice-commits] core.git: scp2/InstallModule_impress.mk scp2/source

[Andras Timar]

 scp2/InstallModule_impress.mk           |    7 +++++--
 scp2/source/impress/module_ogltrans.scp |    6 +++---
 scp2/source/impress/module_ogltrans.ulf |   24 ------------------------
 3 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit 5f4443255386ed205abec7f69f820244d94cd288
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Feb 7 13:03:17 2015 -0800

    tdf#89135 install OpenGL slide transitions unconditionally on Windows
    
    Change-Id: I6efaaf56d56f27159f39046bdf2112ff2b9ed082
    Reviewed-on: https://gerrit.libreoffice.org/14360
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
index 0f10c9d..c8d04a4 100644
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@@ -27,11 +27,14 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
     scp2/source/impress/file_impress \
 ))
 
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/impress,\
-    scp2/source/impress/module_impress \
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
 	$(if $(filter TRUE,$(ENABLE_OPENGL)),\
 		scp2/source/impress/module_ogltrans \
 	) \
 ))
 
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/impress,\
+    scp2/source/impress/module_impress \
+))
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 40fc17b..72ff416 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -22,11 +22,11 @@
 
 Module gid_Module_Optional_OGLTrans
     PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS);
     ParentID = gid_Module_Optional;
     Files = ( auto_ogltrans_ALL, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd );
-    Minimal = NO;
-    Default = NO;
+    Minimal = YES;
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
 End
 
 File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf
deleted file mode 100644
index 349bc60..0000000
--- a/scp2/source/impress/module_ogltrans.ulf
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-
-[STR_NAME_MODULE_OPTIONAL_OGLTRANS]
-en-US = "OpenGL slide transitions for %PRODUCTNAME Impress"
-
-[STR_DESC_MODULE_OPTIONAL_OGLTRANS]
-en-US = "OpenGL slide transitions for %PRODUCTNAME Impress."