[Libreoffice-commits] .: 2 commits - basctl/source

[August Sodora]

 basctl/source/basicide/baside2.cxx    |   20 +++++++++++---------
 basctl/source/basicide/breakpoint.cxx |    2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit ebf168f59f64b868002c10a49448e02939074755
Author: August Sodora <augsod at gmail.com>
Date:   Mon Dec 5 00:52:02 2011 -0500

    So size_t is recognized on windows

diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx
index b763174..6bbfdf9 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -31,6 +31,8 @@
 #include <basic/sbmod.hxx>
 #include <tools/debug.hxx>
 
+#include <stddef.h>
+
 BreakPointList::BreakPointList()
 {}
 
commit 5ca762a9caf9b89f225d2c8ddd32d265d4bddb61
Author: August Sodora <augsod at gmail.com>
Date:   Mon Dec 5 00:47:35 2011 -0500

    String->OUString

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 0f425cf..ddb3781 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -82,7 +82,7 @@ DBG_NAME( ModulWindow )
 
 TYPEINIT1( ModulWindow , IDEBaseWindow );
 
-void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, const String& rTitle, bool bOutput )
+void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, const ::rtl::OUString& rTitle, bool bOutput )
 {
     short nLeftMargin   = LMARGPRN;
     Size aSz = pPrinter->GetOutputSize();
@@ -122,17 +122,20 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
     {
         aFont.SetWeight( WEIGHT_NORMAL );
         pPrinter->SetFont( aFont );
-        String aPageStr( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
-        aPageStr += String( IDEResId( RID_STR_PAGE ) );
-        aPageStr += ' ';
-        aPageStr += String::CreateFromInt32( nCurPage );
-        aPageStr += ']';
         aPos.X() += pPrinter->GetTextWidth( rTitle );
+
         if( bOutput )
-            pPrinter->DrawText( aPos, aPageStr );
+        {
+            ::rtl::OUStringBuffer aPageStr;
+            aPageStr.appendAscii( RTL_CONSTASCII_STRINGPARAM( " [" ) );
+            aPageStr.append(ResId::toString( IDEResId( RID_STR_PAGE ) ));
+            aPageStr.append(' ');
+            aPageStr.append( nCurPage );
+            aPageStr.append(']');
+            pPrinter->DrawText( aPos, aPageStr.makeStringAndClear() );
+        }
     }
 
-
     nY = TMARGPRN-nBorder;
 
     if( bOutput )
@@ -165,7 +168,6 @@ void lcl_ConvertTabsToSpaces( String& rLine )
     }
 }
 
-
 ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, String aLibName,
                           String aName, ::rtl::OUString& aModule )
         :IDEBaseWindow( pParent, rDocument, aLibName, aName )