[Libreoffice-commits] core.git: officecfg/registry sdext/source

Stephan Bergmann sbergman at redhat.com
Thu Nov 5 00:18:46 PST 2015


 officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu   |   21 -------
 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs |   28 ----------
 sdext/source/minimizer/pppoptimizertoken.cxx                              |    7 --
 sdext/source/minimizer/pppoptimizertoken.hxx                              |    7 --
 4 files changed, 63 deletions(-)

New commits:
commit ffde331fbefec360d0f6ca5268cdc9acd1a6440b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 5 09:17:58 2015 +0100

    Remove unused strings
    
    Change-Id: I376a1a9c8198e71eb8fd893ca4382fd25bd55817

diff --git a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 15327e6..d5fb575 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -118,9 +118,6 @@ The current presentation contains no OLE objects.</value>
         <prop oor:name="STR_CHOOSE_SLIDES">
             <value xml:lang="en-US">Choose which slides to delete</value>
         </prop>
-        <prop oor:name="STR_MASTER_PAGES">
-            <value xml:lang="en-US">Master Pages</value>
-        </prop>
         <prop oor:name="STR_DELETE_MASTER_PAGES">
             <value xml:lang="en-US">Delete unused ~master pages</value>
         </prop>
@@ -139,12 +136,6 @@ The current presentation contains no OLE objects.</value>
         <prop oor:name="STR_SUMMARY_TITLE">
             <value xml:lang="en-US">Choose where to apply the following changes</value>
         </prop>
-        <prop oor:name="STR_PROGRESS">
-            <value xml:lang="en-US">Progress</value>
-        </prop>
-        <prop oor:name="STR_OBJECTS_OPTIMIZED">
-            <value xml:lang="en-US">Objects optimized</value>
-        </prop>
         <prop oor:name="STR_APPLY_TO_CURRENT">
             <value xml:lang="en-US">~Apply changes to current presentation</value>
         </prop>
@@ -172,21 +163,9 @@ The current presentation contains no OLE objects.</value>
         <prop oor:name="STR_ESTIMATED_FILESIZE">
             <value xml:lang="en-US">Estimated new file size:</value>
         </prop>
-        <prop oor:name="STR_MB">
-            <value xml:lang="en-US">%1 MB</value>
-        </prop>
         <prop oor:name="MY_SETTINGS">
             <value xml:lang="en-US">My Settings </value>
         </prop>
-        <prop oor:name="STR_DEFAULT_SESSION">
-            <value xml:lang="en-US">default session</value>
-        </prop>
-        <prop oor:name="STR_MODIFY_WARNING">
-            <value xml:lang="en-US">The optimization will modify the current document. Do you want to continue?</value>
-        </prop>
-        <prop oor:name="STR_YES">
-            <value xml:lang="en-US">~Yes</value>
-        </prop>
         <prop oor:name="STR_OK">
             <value xml:lang="en-US">OK</value>
         </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
index 49b7415..c283f27 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
@@ -255,10 +255,6 @@ The current presentation contains no OLE objects.</value>
 		<info><desc>String STR_CHOOSE_SLIDES.</desc></info>
 				<value>Choose which slides to delete</value>
 			</prop>
-			<prop oor:name="STR_MASTER_PAGES" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_MASTER_PAGES.</desc></info>
-				<value>Master Pages</value>
-			</prop>
 			<prop oor:name="STR_DELETE_MASTER_PAGES" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_DELETE_MASTER_PAGES.</desc></info>
 				<value>Delete unused ~master pages</value>
@@ -283,14 +279,6 @@ The current presentation contains no OLE objects.</value>
 		<info><desc>String STR_SUMMARY_TITLE.</desc></info>
 				<value>Choose where to apply the following changes</value>
 			</prop>
-			<prop oor:name="STR_PROGRESS" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_PROGRESS.</desc></info>
-				<value>Progress</value>
-			</prop>
-			<prop oor:name="STR_OBJECTS_OPTIMIZED" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_OBJECTS_OPTIMIZED.</desc></info>
-				<value>Objects optimized</value>
-			</prop>
 			<prop oor:name="STR_APPLY_TO_CURRENT" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_APPLY_TO_CURRENT.</desc></info>
 				<value>~Apply changes to current presentation</value>
@@ -329,26 +317,10 @@ The current presentation contains no OLE objects.</value>
 		<info><desc>String STR_ESTIMATED_FILESIZE.</desc></info>
 				<value>Estimated new file size:</value>
 			</prop>
-			<prop oor:name="STR_MB" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_MB.</desc></info>
-				<value>%1 MB</value>
-			</prop>
 			<prop oor:name="MY_SETTINGS" oor:type="xs:string" oor:localized="true">
 		<info><desc>String MY_SETTINGS.</desc></info>
 				<value>My Settings</value>
 			</prop>
-			<prop oor:name="STR_DEFAULT_SESSION" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_DEFAULT_SESSION.</desc></info>
-				<value>default session</value>
-			</prop>
-			<prop oor:name="STR_MODIFY_WARNING" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_MODIFY_WARNING.</desc></info>
-				<value>The optimization will modify the current document. Do you want to continue?</value>
-			</prop>
-			<prop oor:name="STR_YES" oor:type="xs:string" oor:localized="true">
-		<info><desc>String STR_YES.</desc></info>
-				<value>~Yes</value>
-			</prop>
             <prop oor:name="STR_OK" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_OK.</desc></info>
                 <value>OK</value>
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index ecce848..cc616e9 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -244,15 +244,12 @@ static const TokenTable pTokenTableArray[] =
     { "STR_NO_OLE_OBJECTS_DESC",    STR_NO_OLE_OBJECTS_DESC },
     { "STR_SLIDES",                 STR_SLIDES },
     { "STR_CHOOSE_SLIDES",          STR_CHOOSE_SLIDES },
-    { "STR_MASTER_PAGES",           STR_MASTER_PAGES },
     { "STR_DELETE_MASTER_PAGES",    STR_DELETE_MASTER_PAGES },
     { "STR_DELETE_NOTES_PAGES",     STR_DELETE_NOTES_PAGES },
     { "STR_DELETE_HIDDEN_SLIDES",   STR_DELETE_HIDDEN_SLIDES },
     { "STR_CUSTOM_SHOW",            STR_CUSTOM_SHOW },
     { "STR_SUMMARY",                STR_SUMMARY },
     { "STR_SUMMARY_TITLE",          STR_SUMMARY_TITLE },
-    { "STR_PROGRESS",               STR_PROGRESS },
-    { "STR_OBJECTS_OPTIMIZED",      STR_OBJECTS_OPTIMIZED },
     { "STR_APPLY_TO_CURRENT",       STR_APPLY_TO_CURRENT },
     { "STR_AUTOMATICALLY_OPEN",     STR_AUTOMATICALLY_OPEN },
     { "STR_SAVE_SETTINGS",          STR_SAVE_SETTINGS },
@@ -262,11 +259,7 @@ static const TokenTable pTokenTableArray[] =
     { "STR_CREATE_REPLACEMENT",     STR_CREATE_REPLACEMENT },
     { "STR_CURRENT_FILESIZE",       STR_CURRENT_FILESIZE },
     { "STR_ESTIMATED_FILESIZE",     STR_ESTIMATED_FILESIZE },
-    { "STR_MB",                     STR_MB },
     { "MY_SETTINGS",                STR_MY_SETTINGS },
-    { "STR_DEFAULT_SESSION",        STR_DEFAULT_SESSION },
-    { "STR_MODIFY_WARNING",         STR_MODIFY_WARNING },
-    { "STR_YES",                    STR_YES },
     { "STR_OK",                     STR_OK },
     { "STR_INFO_1",                 STR_INFO_1 },
     { "STR_INFO_2",                 STR_INFO_2 },
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 972ce7a..e7d5ce0 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -228,15 +228,12 @@ enum PPPOptimizerTokenEnum
     STR_NO_OLE_OBJECTS_DESC,
     STR_SLIDES,
     STR_CHOOSE_SLIDES,
-    STR_MASTER_PAGES,
     STR_DELETE_MASTER_PAGES,
     STR_DELETE_NOTES_PAGES,
     STR_DELETE_HIDDEN_SLIDES,
     STR_CUSTOM_SHOW,
     STR_SUMMARY,
     STR_SUMMARY_TITLE,
-    STR_PROGRESS,
-    STR_OBJECTS_OPTIMIZED,
     STR_APPLY_TO_CURRENT,
     STR_AUTOMATICALLY_OPEN,
     STR_SAVE_SETTINGS,
@@ -246,11 +243,7 @@ enum PPPOptimizerTokenEnum
     STR_CREATE_REPLACEMENT,
     STR_CURRENT_FILESIZE,
     STR_ESTIMATED_FILESIZE,
-    STR_MB,
     STR_MY_SETTINGS,
-    STR_DEFAULT_SESSION,
-    STR_MODIFY_WARNING,
-    STR_YES,
     STR_OK,
     STR_INFO_1,
     STR_INFO_2,


More information about the Libreoffice-commits mailing list