[Libreoffice-commits] .: 2 commits - sc/source tools/inc tools/source

[Caolán McNamara]

 sc/source/ui/view/printfun.cxx  |    5 ++++-
 tools/inc/tools/bigint.hxx      |    6 +++---
 tools/source/generic/bigint.cxx |    6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit d29318c78a13f5de031d181b79a655d324ecdf25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 22 11:40:19 2012 +0100

    Resolves: fdo#45869 we want page preview text to layout for print output
    
    We want text to be positioned as it would be for the the high dpi printed
    output, not as would be ideal for the 96dpi preview window itself. It is
    supposed to be a print preview surely.
    
    This should avoid getting different text positions/widths shown in the "page
    preview" of calc than gets used when printed/exported to .pdf
    
    Change-Id: Iea3acce3c1f2a7051007c22768329c52a7c1d4ee

diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index dfc99dc..7f5b665 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1668,7 +1668,10 @@ void ScPrintFunc::MakeEditEngine()
         pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
 
         pEditEngine->EnableUndo(false);
-        pEditEngine->SetRefDevice( pDev );
+        //fdo#45869 we want text to be positioned as it would be for the the
+        //high dpi printed output, not as would be ideal for the 96dpi preview
+        //window itself
+        pEditEngine->SetRefDevice(pPrinter ? pPrinter : pDoc->GetRefDevice());
         pEditEngine->SetWordDelimiters(
                 ScEditUtil::ModifyDelimiters( pEditEngine->GetWordDelimiters() ) );
         pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS );
commit cd8e530dcd265e2bb67124326957dc4390cc6b0a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 22 11:30:14 2012 +0100

    convert BitInt signatures to rtl::OUString
    
    Change-Id: Ic461cdb6283fe48e97787b3f1e8950559d576ca9

diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 1b1d60b..89d2d5e 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -29,9 +29,9 @@
 #define _BIGINT_HXX
 
 #include <climits>
+#include <rtl/ustring.hxx>
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
-#include <tools/string.hxx>
 
 class SvStream;
 #ifdef _TLBIGINT_INT64
@@ -83,7 +83,7 @@ public:
                     BigInt( sal_uInt16 nVal );
                     BigInt( sal_uInt32 nVal );
                     BigInt( const BigInt& rBigInt );
-                    BigInt( const String& rString );
+                    BigInt( const rtl::OUString& rString );
 #ifdef _TLBIGINT_INT64
                     BigInt( const SbxINT64  &r );
                     BigInt( const SbxUINT64 &r );
@@ -97,7 +97,7 @@ public:
     operator        sal_uIntPtr() const;
 
     void            Set( sal_Bool bSet ) { bIsSet = bSet; }
-    String          GetString() const;
+    rtl::OUString   GetString() const;
 
     sal_Bool            IsSet() const { return bIsSet; }
     sal_Bool            IsNeg() const;
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 14e4a39..8bff84b 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -522,7 +522,7 @@ BigInt::BigInt( const BigInt& rBigInt )
 
 // -----------------------------------------------------------------------
 
-BigInt::BigInt( const String& rString )
+BigInt::BigInt( const rtl::OUString& rString )
 {
     bIsSet = sal_True;
     bIsNeg = sal_False;
@@ -530,7 +530,7 @@ BigInt::BigInt( const String& rString )
     nVal   = 0;
 
     sal_Bool bNeg = sal_False;
-    const sal_Unicode* p = rString.GetBuffer();
+    const sal_Unicode* p = rString.getStr();
     if ( *p == '-' )
     {
         bNeg = sal_True;
@@ -655,7 +655,7 @@ BigInt::operator double() const
 
 // -----------------------------------------------------------------------
 
-String BigInt::GetString() const
+rtl::OUString BigInt::GetString() const
 {
     String aString;