[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 6 commits - sw/source

[Petr Mladek]

 sw/source/core/doc/doc.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit b44161cba1b34f9513034561a206768c029bde5b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jan 7 21:01:01 2011 +0100

    remove commented code

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b502253..7221f6a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1339,14 +1339,8 @@ void SwDoc::CalculatePagesForPrinting(
 
     // get PageRange value to use
     OUString aPageRange;
-    // --> PL, OD #i116085# - adjusting fix for i113919
-//    if (bIsPDFExport)
-//    {
-//        aPageRange = rOptions.getStringValue( "PageRange", OUString() );
-//    }
-//    else
+    // PL, OD #i116085# - adjusting fix for i113919
     if ( !bIsPDFExport )
-    // <--            
     {
         // PageContent : 
         // 0 -> print all pages (default if aPageRange is empty)
commit 04a1bae024326f04cbcd0698eb81c0f4adb3a4ba
Merge: d45b32b... 918d432...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jan 7 20:55:01 2011 +0100

    Merge commit 'ooo/OOO330_m19' into libreoffice-3-3

commit 918d4322d8cedadcebaa3b5f57dd465cd15856a8
Merge: 450deef... 4c8a903...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jan 6 14:53:34 2011 +0100

    CWS-TOOLING: integrate CWS ooo33gsl13

commit 4c8a903f074a3230f78ea0a829a0bdb9ecf18b47
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Wed Dec 15 13:24:33 2010 +0100

    ooo33gsl13: #i116085# adjust PageRange handling in writer PDF export

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4cd3601..80c5a95 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1336,12 +1336,14 @@ void SwDoc::CalculatePagesForPrinting(
 
     // get PageRange value to use
     OUString aPageRange;
-    if (bIsPDFExport)
-    {
-        // ?? rOptions.getValue( C2U("Selection") );
-        aPageRange = rOptions.getStringValue( "PageRange", OUString() );
-    }
-    else
+    // --> PL, OD #i116085# - adjusting fix for i113919
+//    if (bIsPDFExport)
+//    {
+//        aPageRange = rOptions.getStringValue( "PageRange", OUString() );
+//    }
+//    else
+    if ( !bIsPDFExport )
+    // <--            
     {
         // PageContent : 
         // 0 -> print all pages (default if aPageRange is empty)
commit 450deef7af2e6150493f9f584bf08600884ca098
Merge: e2bbfbc... 7580b9e...
Author: obo <obo at openoffice.org>
Date:   Thu Dec 9 10:58:42 2010 +0100

    CWS-TOOLING: integrate CWS calc33stopper3

commit 7580b9ec86dbfdf78f70c49159b3e5a17de02e66
Author: os <os at openoffice.org>
Date:   Wed Dec 8 10:17:56 2010 +0100

    #i115956# token translation fixed

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index af5c02c..b9a75ad 100755
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2317,18 +2317,23 @@ void SmParser::Special()
         // conversion of symbol names for 6.0 (XML) file format
         // (name change on import / export.
         // UI uses localized names XML file format does not.)
-        if (IsImportSymbolNames())
+        if( rName.Len() && rName.GetChar( 0 ) == sal_Unicode( '%' ) )
         {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetUiSymbolName( rName );
-            bReplace = TRUE;
-        }
-        else if (IsExportSymbolNames())
-        {
-            const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
-            aNewName = rLSD.GetExportSymbolName( rName );
-            bReplace = TRUE;
+            if (IsImportSymbolNames())
+            {
+                const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+                aNewName = rLSD.GetUiSymbolName( rName.Copy( 1 ) );
+                bReplace = TRUE;
+            }
+            else if (IsExportSymbolNames())
+            {
+                const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+                aNewName = rLSD.GetExportSymbolName( rName.Copy( 1 ) );
+                bReplace = TRUE;
+            }
         }
+        if( aNewName.Len() )
+            aNewName.Insert( '%', 0 );
     }
     else    // 5.0 <-> 6.0 formula text (symbol name) conversion
     {
@@ -2367,7 +2372,7 @@ void SmParser::Special()
 
     if (bReplace  &&  aNewName.Len()  &&  rName != aNewName)
     {
-        Replace( GetTokenIndex() + 1, rName.Len(), aNewName );
+        Replace( GetTokenIndex(), rName.Len(), aNewName );
         rName = aNewName;
     }