Skip to content

C
core
Kaydet (Commit) ceb14e01 authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

üst 15e35093
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 150 deletions
desktop/Executable_soffice.bin.mk
Dosyayı görüntüle @ ceb14e01
......@@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\
endif
$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src))
$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
# vim: set ts=4 sw=4 et:
desktop/Module_desktop.mk
Dosyayı görüntüle @ ceb14e01
......@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
WinResTarget_sdraw \
WinResTarget_simpress \
WinResTarget_soffice \
WinResTarget_sofficebin \
WinResTarget_smath \
WinResTarget_sweb \
WinResTarget_swriter \
......
desktop/WinResTarget_soffice.mk
Dosyayı görüntüle @ ceb14e01
......@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
sysui/desktop/icons/main_app.ico \
))
$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
# vim: set ts=4 sw=4 et:
desktop/WinResTarget_sofficebin.mk 0 → 100644
Dosyayı görüntüle @ ceb14e01
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# 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/
#
# 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.
#
# Major Contributor(s):
# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
# (initial developer)
#
# All Rights Reserved.
#
# 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.
$(eval $(call gb_WinResTarget_WinResTarget,sofficebin/src))
$(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
$$(INCLUDE) \
-I$(SRCDIR)/sysui/desktop \
))
$(eval $(call gb_WinResTarget_set_defs,sofficebin/src,\
$$(DEFS) \
-DRES_APP_NAME=soffice \
-DRES_APP_ICON=icons/main_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,sofficebin/src,\
sysui/desktop/icons/main_app.ico \
))
$(eval $(call gb_WinResTarget_add_file,sofficebin/src,desktop/util/officeloader))
# vim: set ts=4 sw=4 et:
desktop/util/officeloader.rc
Dosyayı görüntüle @ ceb14e01
......@@ -78,34 +78,8 @@ VS_VERSION_INFO VERSIONINFO
7 ICON "icons/oasis-drawing-template.ico"
8 ICON "icons/oasis-presentation.ico"
9 ICON "icons/oasis-presentation-template.ico"
10 ICON "icons/oasis-presentation-template.ico"
11 ICON "icons/oasis-master-document.ico"
12 ICON "icons/oasis-web-template.ico"
13 ICON "icons/oasis-empty-document.ico"
14 ICON "icons/oasis-database.ico"
15 ICON "icons/oasis-formula.ico"
16 ICON "icons/oasis-web-template.ico"
17 ICON "icons/empty-document.ico"
18 ICON "icons/empty-document.ico"
19 ICON "icons/open.ico"
20 ICON "icons/empty-document.ico"
21 ICON "icons/writer_app.ico"
22 ICON "icons/calc_app.ico"
23 ICON "icons/draw_app.ico"
24 ICON "icons/impress_app.ico"
25 ICON "icons/math_app.ico"
26 ICON "icons/base_app.ico"
27 ICON "icons/oasis-empty-document.ico"
28 ICON "icons/text.ico"
29 ICON "icons/text-template.ico"
30 ICON "icons/spreadsheet.ico"
31 ICON "icons/spreadsheet-template.ico"
32 ICON "icons/drawing.ico"
33 ICON "icons/drawing-template.ico"
34 ICON "icons/presentation.ico"
35 ICON "icons/presentation-template.ico"
36 ICON "icons/master-document.ico"
37 ICON "icons/empty-document.ico"
38 ICON "icons/database.ico"
39 ICON "icons/formula.ico"
40 ICON "icons/oxt-extension.ico"
10 ICON "icons/oasis-master-document.ico"
11 ICON "icons/oasis-web-template.ico"
12 ICON "icons/oasis-database.ico"
13 ICON "icons/oasis-formula.ico"
14 ICON "icons/oxt-extension.ico"
officecfg/registry/data/org/openoffice/Setup.xcu
Dosyayı görüntüle @ ceb14e01
......@@ -218,7 +218,7 @@
<value ></value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >15</value>
<value >13</value>
</prop>
<prop oor:name="ooSetupFactoryTemplateFile">
<value ></value>
......@@ -260,7 +260,7 @@
<value ></value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >11</value>
<value >10</value>
</prop>
<prop oor:name="ooSetupFactoryTemplateFile">
<value ></value>
......@@ -454,7 +454,7 @@
<value ></value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >12</value>
<value >1</value>
</prop>
<prop oor:name="ooSetupFactoryTemplateFile">
<value ></value>
......@@ -491,7 +491,7 @@
<value >DbRelationWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......@@ -516,7 +516,7 @@
<value >DbQueryWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......@@ -541,7 +541,7 @@
<value >DbQueryWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......@@ -566,7 +566,7 @@
<value >DbTableWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......@@ -591,7 +591,7 @@
<value >DbBrowserWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......@@ -616,7 +616,7 @@
<value>DbTableDataWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value>14</value>
<value>12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value>GenericCategories</value>
......@@ -709,7 +709,7 @@
<value ></value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >13</value>
<value >1</value>
</prop>
<prop oor:name="ooSetupFactoryTemplateFile">
<value ></value>
......@@ -751,7 +751,7 @@
<value ></value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryTemplateFile">
<value ></value>
......
reportbuilder/registry/data/org/openoffice/Setup.xcu
Dosyayı görüntüle @ ceb14e01
......@@ -39,7 +39,7 @@
<value >DbReportWindowState</value>
</prop>
<prop oor:name="ooSetupFactoryIcon">
<value >14</value>
<value >12</value>
</prop>
<prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
<value >GenericCategories</value>
......
scp2/inc/macros.inc
Dosyayı görüntüle @ ceb14e01
......@@ -391,7 +391,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
End
#define REGISTRY_ENTRY_SHELL(name,default,modid) \
......
scp2/source/base/registryitem_base.scp
Dosyayı görüntüle @ ceb14e01
......@@ -91,7 +91,7 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
ModuleID = gid_Module_Prg_Base_Bin;
Value = "<progpath>\program\soffice.exe,13";
Value = "<progpath>\program\soffice.bin,11";
End
#ifdef _MSC_VER
......
scp2/source/binfilter/registryitem_binfilter.scp
Dosyayı görüntüle @ ceb14e01
......@@ -110,7 +110,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Binfilter;
Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
Value = "<progpath>\program\soffice.exe,27";
Value = "<progpath>\program\soffice.bin,1";
End
RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
......@@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
ModuleID = gid_Module_Optional_Binfilter;
Value = "<progpath>\program\soffice.exe,35";
Value = "<progpath>\program\soffice.bin,9";
End
RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
......@@ -248,7 +248,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Binfilter;
Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
Value = "<progpath>\program\soffice.exe,29";
Value = "<progpath>\program\soffice.bin,3";
End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
......@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Binfilter;
Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
Value = "<progpath>\program\soffice.exe,33";
Value = "<progpath>\program\soffice.bin,7";
End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
......@@ -476,7 +476,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Binfilter;
Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
Value = "<progpath>\program\soffice.exe,31";
Value = "<progpath>\program\soffice.bin,5";
End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
......@@ -573,7 +573,7 @@ RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarChartDocument.5\DefaultIcon";
ModuleID = gid_Module_Optional_Binfilter;
Value = "<progpath>\program\soffice.exe,36";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
......@@ -636,7 +636,7 @@ RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
ModuleID = gid_Module_Optional_Binfilter;
Value = "<progpath>\program\soffice.exe,15";
Value = "<progpath>\program\soffice.bin,10";
End
RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
......@@ -749,7 +749,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Binfilter;
Subkey = "soffice.StarMathDocument.5\DefaultIcon";
Value = "<progpath>\program\soffice.exe,38";
Value = "<progpath>\program\soffice.bin,12";
End
RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
......
scp2/source/calc/registryitem_calc.scp
Dosyayı görüntüle @ ceb14e01
......@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochandler32
......@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochandler32
......@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
Value = "<progpath>\program\soffice.exe,29";
Value = "<progpath>\program\soffice.bin,3";
End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
......@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
ModuleID = gid_Module_Prg_Calc_Bin;
Value = "<progpath>\program\soffice.exe,30";
Value = "<progpath>\program\soffice.bin,4";
End
RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
......@@ -665,7 +665,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "opendocument.CalcDocument.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,3";
Value = "<progpath>\program\soffice.bin,3";
End
#ifdef _MSC_VER
......@@ -858,7 +858,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
ModuleID = gid_Module_Prg_Calc_Bin;
Value = "<progpath>\program\soffice.exe,4";
Value = "<progpath>\program\soffice.bin,4";
End
#ifdef _MSC_VER
......@@ -1176,11 +1176,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
// registering the mso file types
CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_MSO_Reg, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_MSO_Reg, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
scp2/source/draw/registryitem_draw.scp
Dosyayı görüntüle @ ceb14e01
......@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochandler32
......@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochandler32
......@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
Value = "<progpath>\program\soffice.exe,31";
Value = "<progpath>\program\soffice.bin,5";
End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
......@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
ModuleID = gid_Module_Prg_Draw_Bin;
Value = "<progpath>\program\soffice.exe,32";
Value = "<progpath>\program\soffice.bin,6";
End
RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
......@@ -664,7 +664,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "opendocument.DrawDocument.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,5";
Value = "<progpath>\program\soffice.bin,5";
End
#ifdef _MSC_VER
......@@ -857,7 +857,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
ModuleID = gid_Module_Prg_Draw_Bin;
Value = "<progpath>\program\soffice.exe,6";
Value = "<progpath>\program\soffice.bin,6";
End
#ifdef _MSC_VER
......
scp2/source/impress/registryitem_impress.scp
Dosyayı görüntüle @ ceb14e01
......@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochandler32
......@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochandler32
......@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
Value = "<progpath>\program\soffice.exe,33";
Value = "<progpath>\program\soffice.bin,7";
End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
......@@ -402,7 +402,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
ModuleID = gid_Module_Prg_Impress_Bin;
Value = "<progpath>\program\soffice.exe,34";
Value = "<progpath>\program\soffice.bin,8";
End
RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
......@@ -679,7 +679,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,7";
Value = "<progpath>\program\soffice.bin,7";
End
#ifdef _MSC_VER
......@@ -886,7 +886,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
ModuleID = gid_Module_Prg_Impress_Bin;
Value = "<progpath>\program\soffice.exe,8";
Value = "<progpath>\program\soffice.bin,8";
End
#ifdef _MSC_VER
......@@ -1040,11 +1040,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
// registering the mso file types
CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps, PPS, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
scp2/source/math/registryitem_math.scp
Dosyayı görüntüle @ ceb14e01
......@@ -75,7 +75,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochandler32
......@@ -194,7 +194,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochandler32
......@@ -290,7 +290,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "soffice.StarMathDocument.6\DefaultIcon";
Value = "<progpath>\program\soffice.exe,38";
Value = "<progpath>\program\soffice.bin,12";
End
RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
......@@ -546,7 +546,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "opendocument.MathDocument.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,14";
Value = "<progpath>\program\soffice.bin,12";
End
#ifdef _MSC_VER
......
scp2/source/ooo/registryitem_ooo.scp
Dosyayı görüntüle @ ceb14e01
......@@ -603,7 +603,7 @@ RegistryItem gid_Regitem_Office_Extension_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Root;
Subkey = "office.Extension.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,39";
Value = "<progpath>\program\soffice.bin,13";
Styles = ();
End
......@@ -635,7 +635,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
ModuleID = gid_Module_Root;
Name = "ApplicationIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
Styles = ();
End
......
scp2/source/writer/registryitem_writer.scp
Dosyayı görüntüle @ ceb14e01
......@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochandler32
......@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Defaultico
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DefaultIcon";
Value = "<progpath>\program\soffice.exe,0";
Value = "<progpath>\program\soffice.bin,0";
End
RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochandler32
......@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
Value = "<progpath>\program\soffice.exe,27";
Value = "<progpath>\program\soffice.bin,1";
End
RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
......@@ -395,7 +395,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
ModuleID = gid_Module_Prg_Wrt_Bin;
Value = "<progpath>\program\soffice.exe,35";
Value = "<progpath>\program\soffice.bin,9";
End
RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
......@@ -465,7 +465,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
ModuleID = gid_Module_Prg_Wrt_Bin;
Value = "<progpath>\program\soffice.exe,28";
Value = "<progpath>\program\soffice.bin,2";
End
RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
......@@ -788,7 +788,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "opendocument.WriterDocument.1\DefaultIcon";
Value = "<progpath>\program\soffice.exe,1";
Value = "<progpath>\program\soffice.bin,1";
End
RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
......@@ -1004,7 +1004,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
ModuleID = gid_Module_Prg_Wrt_Bin;
Value = "<progpath>\program\soffice.exe,2";
Value = "<progpath>\program\soffice.bin,2";
End
#ifdef _MSC_VER
......@@ -1130,7 +1130,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
ModuleID = gid_Module_Prg_Wrt_Bin;
Value = "<progpath>\program\soffice.exe,10";
Value = "<progpath>\program\soffice.bin,9";
End
#ifdef _MSC_VER
......@@ -1256,7 +1256,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
ModuleID = gid_Module_Prg_Wrt_Bin;
Value = "<progpath>\program\soffice.exe,11";
Value = "<progpath>\program\soffice.bin,10";
End
RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
......@@ -1568,11 +1568,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
// registering the mso file types
// CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type)
CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_MSO_Reg, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_MSO_Reg, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_MSO_Reg, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_MSO_Reg, doc, DOC, MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_MSO_Reg, dot, DOT, MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_MSO_Reg, rtf, RTF, MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
Dosyayı görüntüle @ ceb14e01
......@@ -20,6 +20,7 @@ RegistrationContextInformation::RegistrationContextInformation(MSIHANDLE hMsi, c
{
assert(m_OOExecPath.length());
ExtractOpenOfficeExecNameFromPath();
m_OOIconPath = m_OOExecPath.replace(m_OOExecPath.find(m_OOExecName), m_OOExecName.size(), std::wstring(TEXT("soffice.bin")));
}
std::wstring RegistrationContextInformation::GetWordDocumentDisplayName() const
......@@ -36,7 +37,7 @@ std::wstring RegistrationContextInformation::GetWordDocumentFileExtension() cons
std::wstring RegistrationContextInformation::GetWordDocumentDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",1"));
return m_OOIconPath + std::wstring(TEXT(",1"));
}
std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand() const
......@@ -70,7 +71,7 @@ std::wstring RegistrationContextInformation::GetWordTemplateFileExtension() cons
std::wstring RegistrationContextInformation::GetWordTemplateDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",2"));
return m_OOIconPath + std::wstring(TEXT(",2"));
}
std::wstring RegistrationContextInformation::GetWordTemplateDefaultShellCommand() const
......@@ -92,7 +93,7 @@ std::wstring RegistrationContextInformation::GetRtfDocumentFileExtension() const
std::wstring RegistrationContextInformation::GetRtfDocumentDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",1"));
return m_OOIconPath + std::wstring(TEXT(",1"));
}
std::wstring RegistrationContextInformation::GetRtfDocumentDefaultShellCommand() const
......@@ -114,7 +115,7 @@ std::wstring RegistrationContextInformation::GetExcelSheetFileExtension() const
std::wstring RegistrationContextInformation::GetExcelSheetDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",3"));
return m_OOIconPath + std::wstring(TEXT(",3"));
}
std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand() const
......@@ -148,7 +149,7 @@ std::wstring RegistrationContextInformation::GetExcelTemplateFileExtension() con
std::wstring RegistrationContextInformation::GetExcelTemplateDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",4"));
return m_OOIconPath + std::wstring(TEXT(",4"));
}
std::wstring RegistrationContextInformation::GetExcelTemplateDefaultShellCommand() const
......@@ -170,7 +171,7 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentFileExtension(
std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",7"));
return m_OOIconPath + std::wstring(TEXT(",7"));
}
std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCommand() const
......@@ -204,7 +205,7 @@ std::wstring RegistrationContextInformation::GetPowerPointTemplateFileExtension(
std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",8"));
return m_OOIconPath + std::wstring(TEXT(",8"));
}
std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultShellCommand() const
......@@ -226,7 +227,7 @@ std::wstring RegistrationContextInformation::GetPowerPointShowFileExtension() co
std::wstring RegistrationContextInformation::GetPowerPointShowDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",7"));
return m_OOIconPath + std::wstring(TEXT(",7"));
}
std::wstring RegistrationContextInformation::GetPowerPointShowDefaultShellCommand() const
......
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
Dosyayı görüntüle @ ceb14e01
......@@ -165,6 +165,7 @@ private:
MSIHANDLE msihandle_;
std::wstring m_OOExecPath;
std::wstring m_OOExecName;
std::wstring m_OOIconPath;