#i92516# more changes for final UI spec

2 files changed, 7 insertions, 8 deletions

diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index fdf6ce2a7462..47f51fe18c04 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -3584,15 +3584,15 @@ StringArray RID_PRINTUIOPTIONS
 {
     ItemList [en-US] =
     {
-        <"Formula"; >;
-        < "Print options"; >;
+        < "%PRODUCTNAME %s"; >;
+        < "Contents"; >;
         < "~Title row"; >;
         < "Specifies whether you want the name of the document to be included in the printout"; >;
         < "~Formula text"; >;
         < "Specifies whether to include the contents of the \"Commands\" window at the bottom of the printout."; >;
-        < "B~order"; >;
+        < "B~orders"; >;
         < "Applies a thin border to the formula area in the printout."; >;
-        < "Print format"; >;
+        < "Size"; >;
         < "O~riginal size"; >;
         < "Prints the formula without adjusting the current font size."; >;
         < "Fit to ~page"; >;
@@ -3602,7 +3602,6 @@ StringArray RID_PRINTUIOPTIONS
         < "Miscellaneous options"; >;
         < "Ig~nore ~~ and ` at the end of the line"; >;
         < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
-        < "%PRODUCTNAME %s"; >;
     };
 };
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 54a4ae78207b..828dec857c9c 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -85,8 +85,8 @@ using namespace ::com::sun::star::script;
 SmPrintUIOptions::SmPrintUIOptions()

 {

     ResStringArray      aLocalizedStrings( SmResId( RID_PRINTUIOPTIONS ) );

-    DBG_ASSERT( aLocalizedStrings.Count() >= 19, "resource incomplete" );

-    if( aLocalizedStrings.Count() < 19 ) // bad resource ?

+    DBG_ASSERT( aLocalizedStrings.Count() >= 18, "resource incomplete" );

+    if( aLocalizedStrings.Count() < 18 ) // bad resource ?

         return;

 

     SmModule *pp = SM_MOD1();

@@ -101,7 +101,7 @@ SmPrintUIOptions::SmPrintUIOptions()
     

     // create Section for formula (results in an extra tab page in dialog)

     SvtModuleOptions aOpt;

-    String aAppGroupname( aLocalizedStrings.GetString( 18 ) );

+    String aAppGroupname( aLocalizedStrings.GetString( 0 ) );

     aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),

                                     aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); 

     m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );