[Libreoffice-commits] .: 4 commits - framework/source sfx2/source svx/source

[Caolán McNamara]

 framework/source/xml/toolboxdocumenthandler.cxx |   21 ++++-----------------
 sfx2/source/dialog/templdlg.cxx                 |    5 +++--
 sfx2/source/doc/sfxacldetect.hxx                |    3 +++
 svx/source/items/numfmtsh.cxx                   |    3 +--
 4 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit a91ecea2c9e656f35fac086aa2f81d74e9f0898f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 14 11:23:22 2011 +0000

    adapt for move of natural sort

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 58eb7fd..5f279a1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -76,6 +76,7 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/string.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -684,7 +685,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
                     // initial sortiert einfuegen
                     USHORT nPos;
                     for( nPos = 0 ; nPos < pCmp->Count() &&
-                        (*pCmp->pChilds)[nPos]->aName.CompareToNumeric(pEntry->aName) < 0 ; nPos++);
+                        comphelper::string::compareNatural((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++);
                     pCmp->Put(pEntry,nPos);
                     break;
                 }
@@ -1317,7 +1318,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
                 //Bubblesort
                 USHORT nPos;
                 for( nPos = aStrings.Count() ; nPos &&
-                    aStrings[nPos-1]->CompareToNumeric(pStyle->GetName()) > 0 ; nPos--);
+                    comphelper::string::compareNatural(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--);
                 aStrings.Insert( new String( pStyle->GetName() ), nPos );
                 pStyle = pStyleSheetPool->Next();
             }
commit e14a7a06c3e368e6942035277212ca5ebc74ffca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 14 09:32:32 2011 +0000

    add mode lines to new files

diff --git a/sfx2/source/doc/sfxacldetect.hxx b/sfx2/source/doc/sfxacldetect.hxx
index 99868f6..40112f3 100644
--- a/sfx2/source/doc/sfxacldetect.hxx
+++ b/sfx2/source/doc/sfxacldetect.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
@@ -37,3 +38,5 @@ sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath );
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8438df34818e5c10955c8809f7d63bf05d830fad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 14 09:09:58 2011 +0000

    WaE: var set but unused

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index b1b5c52..c228603 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1840,13 +1840,12 @@ sal_Bool SvxNumberFormatShell::IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,co
         if(nPos<nCount)
         {
             NfWSStringsDtor aWSStringsDtor;
-            sal_uInt16 nDefault;
 
             const NfCurrencyEntry* pTmpCurrencyEntry=rCurrencyTable[nPos];
 
             if ( pTmpCurrencyEntry!=NULL)
             {
-                nDefault = pFormatter->GetCurrencyFormatStrings( aWSStringsDtor,
+                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor,
                                 *pTmpCurrencyEntry, bTmpBanking );
 
                 for(sal_uInt16 i=0;i<aWSStringsDtor.Count();i++)
commit cac735b749c7fcb98194e94c46d5dc30a8773b32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 14 08:50:22 2011 +0000

    WaE: set but unused

diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index a539224..aa2cda8 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -319,8 +319,6 @@ throw(	SAXException, RuntimeException )
                 ::rtl::OUString        aTooltip;
                 ::rtl::OUString        aBitmapName;
                 sal_uInt16      nItemBits( 0 );
-                sal_uInt16      nWidth( 0 );
-                sal_uInt16      nUserDef( 0 );
                 sal_Bool        bVisible( sal_True );
 
                 for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
@@ -370,18 +368,6 @@ throw(	SAXException, RuntimeException )
                             }
                             break;
 
-                            case TB_ATTRIBUTE_WIDTH:
-                            {
-                                nWidth = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
-                            }
-                            break;
-
-                            case TB_ATTRIBUTE_USER:
-                            {
-                                nUserDef = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
-                            }
-                            break;
-
                             case TB_ATTRIBUTE_HELPID:
                             {
                                 aHelpURL = xAttribs->getValueByIndex( n );
@@ -429,9 +415,10 @@ throw(	SAXException, RuntimeException )
                                 while ( nIndex >= 0 );
                             }
                             break;
-
-                                          default:
-                                              break;
+                            case TB_ATTRIBUTE_USER:
+                            case TB_ATTRIBUTE_WIDTH:
+                            default:
+                            break;
                         }
                     }
                 } // for