Automated merge with ssh://hg.services.openoffice.org/cws/gridcontrol07

2 files changed, 32 insertions, 29 deletions

diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 6781efc070fe..4aaa55409266 100644..100755
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -41,10 +41,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-
-#ifndef  _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_
-#include <com/sun/star/task/XInteractionHandler.hdl>
-#endif
+#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
@@ -165,7 +162,7 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
     SvtURLBox* pBoxP, const String& rText )
     : aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) )
     , aBaseURL( pBoxP->aBaseURL )
-    , aText(  rText )
+    , aText( rText )
     , pBox( pBoxP )
     , bStop( FALSE )
     , bOnlyDirectories( pBoxP->bOnlyDirectories )
@@ -426,7 +423,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL,
             uno::Reference< XDynamicResultSet > xDynResultSet;
             ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
             if ( bOnlyDirectories )
-                eInclude =  INCLUDE_FOLDERS_ONLY;
+                eInclude = INCLUDE_FOLDERS_ONLY;
 
             xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
 
@@ -654,7 +651,7 @@ void SvtMatchContext_Impl::run()
                 {
                     // if text input is a directory, it must be part of the match list! Until then it is scanned
                     if ( UCBContentHelper::IsFolder( aMainURL ) && aURLObject.hasFinalSlash() )
-                           Insert( aText, aMatch );
+                            Insert( aText, aMatch );
                     else
                         // otherwise the parent folder will be taken
                         aURLObject.removeSegment();
@@ -684,6 +681,7 @@ void SvtMatchContext_Impl::run()
             aCurObj.SetURL( *aPickList.GetObject( nPos ) );
             aCurObj.SetSmartURL( aCurObj.GetURLNoPass());
             aCurMainURL = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
+
             if( eProt != INET_PROT_NOT_VALID && aCurObj.GetProtocol() != eProt )
                 continue;
 
@@ -708,7 +706,7 @@ void SvtMatchContext_Impl::run()
                     {
                         // try if text matches the scheme
                         String aScheme( INetURLObject::GetScheme( aCurObj.GetProtocol() ) );
-                        if ( aText.CompareTo( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() )
+                        if ( aText.CompareIgnoreCaseToAscii( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() )
                         {
                             if( bFull )
                                 aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -727,7 +725,7 @@ void SvtMatchContext_Impl::run()
                         aCurString.Erase( 0, aScheme.Len() );
                     }
 
-                    if( aText.CompareTo( aCurString, aText.Len() )== COMPARE_EQUAL )
+                    if( aText.CompareIgnoreCaseToAscii( aCurString, aText.Len() )== COMPARE_EQUAL )
                     {
                         if( bFull )
                             aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -858,6 +856,7 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
 void SvtURLBox::ImplInit()
 {
     pImp = new SvtURLBox_Impl();
+
     SetHelpId( ".uno:OpenURL" );
     EnableAutocomplete( FALSE );
 
@@ -1314,7 +1313,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
                 return sal_False; // no such user
 #else
             pPasswd = getpwnam( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr() );
-             if( pPasswd )
+            if( pPasswd )
                 aParseTilde = String::CreateFromAscii( pPasswd->pw_dir );
             else
                 return sal_False; // no such user
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 6fcbd92597ba..011dd4cd7956 100644..100755
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -468,6 +468,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     BOOL    bNoTicks = FALSE;
 
     // Groessenvorberechnung
+    // Sizes calculation
     BOOL bVertRight = FALSE;
     if ( mnWinStyle & WB_HORZ )
         nTickWidth = aPixSize.Width();
@@ -486,19 +487,21 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     }
     long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width();
     if ( nMaxWidth < 0 )
-        nMaxWidth *= -1;
+        nMaxWidth = -nMaxWidth;
     nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit;
     UniString aNumStr( UniString::CreateFromInt32( nMaxWidth ) );
     long nTxtWidth = GetTextWidth( aNumStr );
-    if ( (nTxtWidth*2) > nTickWidth )
+
+    const long nTextOff   = 4;
+    if ( nTickWidth < nTxtWidth+nTextOff )
     {
+        // Calculate the scale of the ruler
         long nMulti     = 1;
         long nOrgTick3  = nTick3;
-        long nTextOff   = 2;
         while ( nTickWidth < nTxtWidth+nTextOff )
         {
             long nOldMulti = nMulti;
-            if ( !nTickWidth )
+            if ( !nTickWidth ) //If nTickWidth equals 0
                 nMulti *= 10;
             else if ( nMulti < 10 )
                 nMulti++;
@@ -516,8 +519,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 bNoTicks = TRUE;
                 break;
             }
-            if ( nMulti >= 100 )
-                nTextOff = 4;
+
             nTick3 = nOrgTick3 * nMulti;
             aPixSize = maVirDev.LogicToPixel( Size( nTick3, nTick3 ), maMapMode );
             if ( mnWinStyle & WB_HORZ )
@@ -541,7 +543,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
             {
                 if ( nStart > nMin )
                 {
-                    // Nur 0 malen, wenn Margin1 nicht gleich dem NullPunkt ist
+                    // 0 is only painted when Margin1 is not equal to zero
                     if ( (mpData->nMargin1Style & RULER_STYLE_INVISIBLE) || (mpData->nMargin1 != 0) )
                     {
                         aNumStr = (sal_Unicode)'0';
@@ -564,7 +566,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 else
                     n = aPixSize.Height();
 
-                // Tick3 - Ausgabe (Text)
+                // Tick3 - Output (Text)
                 if ( !(nTick % nTick3) )
                 {
                     aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
@@ -573,7 +575,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                     nX = nStart+n;
                     //different orientation needs a different starting position
                     nY = bVertRight ? nCenter+nTxtHeight2 : nCenter-nTxtHeight2;
-                    if ( nX < nMax )
+
+                    // Check if we can display full number
+                    if ( nX < (nMax-nTxtWidth2) )
                     {
                         if ( mnWinStyle & WB_HORZ )
                             nX -= nTxtWidth2;
@@ -582,7 +586,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                         ImplVDrawText( nX, nY, aNumStr );
                     }
                     nX = nStart-n;
-                    if ( nX > nMin )
+                    if ( nX > (nMin+nTxtWidth2) )
                     {
                         if ( mnWinStyle & WB_HORZ )
                             nX -= nTxtWidth2;
@@ -591,7 +595,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                         ImplVDrawText( nX, nY, aNumStr );
                     }
                 }
-                // Tick/Tick2 - Ausgabe (Striche)
+                // Tick/Tick2 - Output (Strokes)
                 else
                 {
                     if ( !(nTick % aImplRulerUnitTab[mnUnitIndex].nTick2) )
@@ -1258,7 +1262,7 @@ void Ruler::ImplFormat()
     Size    aVirDevSize;
     BOOL    b3DLook = !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO);
 
-    // VirtualDevice initialisieren
+    // VirtualDevice initialize
     if ( mnWinStyle & WB_HORZ )
     {
         aVirDevSize.Width() = mnVirWidth;
@@ -1387,15 +1391,15 @@ void Ruler::ImplFormat()
         if ( nP2 < nVirRight )
             nMax--;
 
-        // Beschriftung ausgeben
+        // Draw captions
         ImplDrawTicks( nMin, nMax, nStart, nCenter );
     }
 
-    // Spalten ausgeben
+    // Draw borders
     if ( mpData->pBorders )
         ImplDrawBorders( nVirLeft, nP2, nVirTop, nVirBottom );
 
-    // Einzuege ausgeben
+    // Draw indents
     if ( mpData->pIndents )
         ImplDrawIndents( nVirLeft, nP2, nVirTop-1, nVirBottom+1 );
 
@@ -2888,7 +2892,7 @@ void Ruler::SetMargin2( long nPos, USHORT nMarginStyle )
 
 void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
 {
-    // Testen, ob sich was geaendert hat
+    // To determine if what has changed
     if ( mpData->nLines == n )
     {
         USHORT           i = n;
@@ -2907,18 +2911,18 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
             return;
     }
 
-    // Neue Werte setzen und neu ausgeben
+    // New values and new share issue
     BOOL bMustUpdate;
     if ( IsReallyVisible() && IsUpdateMode() )
         bMustUpdate = TRUE;
     else
         bMustUpdate = FALSE;
 
-    // Alte Linien loeschen
+    // Delete old lines
     if ( bMustUpdate )
         ImplInvertLines();
 
-    // Neue Daten setzen
+    // New data set
     if ( !n || !pLineAry )
     {
         if ( !mpData->pLines )