[Libreoffice-commits] core.git: 3 commits - svtools/source sw/source

[Tor Lillqvist]

 svtools/source/contnr/fileview.cxx |   94 -------------------------------------
 sw/source/filter/ascii/parasc.cxx  |    3 -
 2 files changed, 1 insertion(+), 96 deletions(-)

New commits:
commit c6542e4f7a759b163ced45155ab6ab898be2f111
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 27 12:50:42 2014 +0300

    WaE: macro is not used
    
    Change-Id: I37ec7e6104dc9526b1792f163fe58ec8673274c2

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 3ca0bf6..6dbe87f 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -91,8 +91,6 @@ using ::svt::FolderDescriptor;
 #define COLUMN_SIZE         3
 #define COLUMN_DATE         4
 
-#define SEPARATOR_STR  "----------------------------------"
-
 #define ROW_HEIGHT                17    // the height of a row has to be a little higher than the bitmap
 #define QUICK_SEARCH_TIMEOUT    1500    // time in mSec before the quicksearch string will be reseted
 
commit 93b35682c4458f76f09e10cf934dd51adfb26deb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 27 12:50:26 2014 +0300

    WaE: Unreferenced function definitions
    
    Change-Id: I8c21bfd70e5afb6d4f9a0a57f9946074c1b16a52

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 8ebc78f..3ca0bf6 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -205,8 +205,6 @@ public:
 
     void            EnableAutoResize() { mbAutoResize = true; }
     void            EnableDelete( bool bEnable ) { mbEnableDelete = bEnable; }
-    void            EnableRename( bool bEnable ) { mbEnableRename = bEnable; }
-    bool            IsDeleteOrContextMenuEnabled() { return mbEnableDelete || IsContextMenuHandlingEnabled(); }
 
     Reference< XCommandEnvironment >    GetCommandEnvironment() const { return mxCmdEnv; }
 
@@ -468,7 +466,6 @@ public:
     // #83004# -------
     void                        ReplaceTabWithString( OUString& aValue );
     void                    CreateDisplayText_Impl();
-    void                    CreateVector_Impl( const Sequence < OUString > &rList );
     void                    SortFolderContent_Impl();
 
     void                    EntryRemoved( const OUString& rURL );
@@ -2027,95 +2024,6 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
     }
 }
 
-
-// this function converts the sequence of strings into a vector of SortingData
-// the string should have the form :
-// title \t type \t size \t date \t target url \t is folder \t image url
-
-void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
-{
-    ::osl::MutexGuard aGuard( maMutex );
-
-    OUString aTab( "\t" );
-
-    sal_uInt32 nCount = (sal_uInt32) rList.getLength();
-
-    for( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        SortingData_Impl*   pEntry = new SortingData_Impl;
-        OUString            aValue = rList[i];
-        OUString            aDisplayText;
-        sal_Int32           nIndex = 0;
-
-        // get the title
-        pEntry->SetNewTitle( aValue.getToken( 0, '\t', nIndex ) );
-        aDisplayText = pEntry->GetTitle();
-        ReplaceTabWithString( aDisplayText );
-        aDisplayText += aTab;
-
-        // get the type
-        if ( nIndex >= 0 )
-        {
-            pEntry->maType = aValue.getToken( 0, '\t', nIndex );
-            aDisplayText += pEntry->maType;
-        }
-        aDisplayText += aTab;
-
-        // get the size
-        if ( nIndex >= 0 )
-        {
-            OUString aSize = aValue.getToken( 0, '\t', nIndex );
-            aDisplayText += aSize;
-
-            if ( !aSize.isEmpty() )
-                pEntry->maSize = aSize.toInt64();
-        }
-        aDisplayText += aTab;
-
-        // get the date
-        if ( nIndex >= 0 )
-        {
-            OUString aDate = aValue.getToken( 0, '\t', nIndex );
-            aDisplayText += aDate;
-
-            if ( !aDate.isEmpty() )
-            {
-                SAL_WARN( "svtools.contnr", "Don't know, how to convert date" );
-                ;// convert date string to date
-            }
-        }
-        // get the target url
-        if ( nIndex >= 0 )
-        {
-            pEntry->maTargetURL = aValue.getToken( 0, '\t', nIndex );
-        }
-        // get the size
-        if ( nIndex >= 0 )
-        {
-            OUString aBool = aValue.getToken( 0, '\t', nIndex );
-            if ( !aBool.isEmpty() )
-                pEntry->mbIsFolder = aBool.toBoolean();
-        }
-        // get the image url
-        if ( nIndex >= 0 )
-        {
-            pEntry->maImageURL = aValue.getToken( 0, '\t', nIndex );
-        }
-
-        // set the display text
-        pEntry->maDisplayText = aDisplayText;
-
-        // detect the image
-        if( aValue != SEPARATOR_STR )
-        {
-            INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL );
-            pEntry->maImage = SvFileInformationManager::GetImage( aObj, false );
-        }
-        maContent.push_back( pEntry );
-    }
-}
-
-
 void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, bool bAscending )
 {
     ::osl::MutexGuard aGuard( maMutex );
commit 2fb876d85ddbfea0e6b6a38f71135e3dbe4233bb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 27 12:40:10 2014 +0300

    Don't pointlessly make it harder to git grep for this message
    
    Change-Id: Ia2777d61678f511c1e604c55b4e349d2ab938b24

diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 803ef46..7210289 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -262,8 +262,7 @@ sal_uLong SwASCIIParser::ReadChars()
         nOrig = nLen = rInput.Read(pArr, ASC_BUFFLEN);
         rtl_TextEncoding eCharSet;
         bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, &bSwapUnicode);
-        OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must "
-            "have failed");
+        OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must have failed");
         if (bRet && eCharSet != RTL_TEXTENCODING_DONTKNOW)
         {
             aEmpty.SetCharSet(eCharSet);