[Libreoffice-commits] core.git: 4 commits - comphelper/source include/comphelper include/sfx2 include/svx include/tools sd/source sfx2/source solenv/bin svx/source sw/inc sw/source tools/source unusedcode.easy writerfilter/Library_writerfilter.mk writerfilter/source

Caolán McNamara caolanm at redhat.com
Wed Oct 9 05:17:58 PDT 2013


 comphelper/source/misc/string.cxx                   |   32 +++
 include/comphelper/string.hxx                       |   11 +
 include/sfx2/sidebar/Sidebar.hxx                    |    8 
 include/sfx2/taskpane.hxx                           |   21 --
 include/svx/rulritem.hxx                            |    3 
 include/tools/string.hxx                            |    3 
 sd/source/ui/framework/tools/FrameworkHelper.cxx    |   14 -
 sd/source/ui/inc/ViewShellManager.hxx               |    7 
 sd/source/ui/inc/framework/FrameworkHelper.hxx      |   10 -
 sd/source/ui/sidebar/AllMasterPagesSelector.cxx     |    1 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |    1 
 sd/source/ui/sidebar/LayoutMenu.cxx                 |    1 
 sd/source/ui/sidebar/LayoutMenu.hxx                 |    1 
 sd/source/ui/sidebar/MasterPagesSelector.cxx        |    1 
 sd/source/ui/sidebar/MasterPagesSelector.hxx        |    1 
 sd/source/ui/sidebar/RecentMasterPagesSelector.cxx  |    1 
 sd/source/ui/sidebar/SidebarShellManager.cxx        |  176 --------------------
 sd/source/ui/sidebar/SidebarShellManager.hxx        |  116 -------------
 sd/source/ui/view/ViewShellManager.cxx              |   40 ----
 sfx2/source/dialog/taskpane.cxx                     |   14 -
 sfx2/source/sidebar/Sidebar.cxx                     |   12 -
 solenv/bin/callcatcher.Makefile                     |    4 
 svx/source/dialog/rulritem.cxx                      |   15 -
 svx/source/engine3d/float3d.cxx                     |    2 
 sw/inc/iodetect.hxx                                 |   17 -
 sw/inc/shellres.hxx                                 |    2 
 sw/source/core/unocore/unofield.cxx                 |   36 +---
 sw/source/core/unocore/unoidx.cxx                   |    4 
 sw/source/filter/basflt/iodetect.cxx                |   54 ++----
 sw/source/filter/html/htmlcss1.cxx                  |   15 -
 sw/source/filter/html/htmlplug.cxx                  |    9 -
 sw/source/filter/ww8/styles.cxx                     |    6 
 sw/source/filter/ww8/wrtww8.cxx                     |    4 
 sw/source/filter/ww8/wrtww8.hxx                     |    2 
 sw/source/filter/ww8/ww8par5.cxx                    |    8 
 sw/source/ui/envelp/envimg.cxx                      |   22 +-
 sw/source/ui/fldui/changedb.cxx                     |   17 -
 sw/source/ui/index/cnttab.cxx                       |    4 
 sw/source/ui/shells/langhelper.cxx                  |   20 +-
 sw/source/ui/shells/textsh1.cxx                     |   20 +-
 tools/source/string/strascii.cxx                    |   36 ----
 unusedcode.easy                                     |   72 +++++++-
 writerfilter/Library_writerfilter.mk                |    1 
 writerfilter/source/doctok/WW8Clx.cxx               |   78 --------
 writerfilter/source/doctok/WW8Clx.hxx               |   83 ---------
 45 files changed, 224 insertions(+), 781 deletions(-)

New commits:
commit 69c842a4f3cd274c62b0539eb2bcbd3c0cc8879c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 9 11:59:58 2013 +0100

    update unusedcode list
    
    Change-Id: I201985753fc53f037807e7870c6786a442717d6e

diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 2ce7b31..458100e 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -43,14 +43,6 @@ public:
     static void ShowPanel (
         const ::rtl::OUString& rsPanelId,
         const cssu::Reference<css::frame::XFrame>& rxFrame);
-
-    /** Switch to the specified deck.
-        Note that most of the work is done asynchronously and that
-        this function probably returns before the requested deck is visible.
-    */
-    static void ShowDeck (
-        const ::rtl::OUString& rsDeckId,
-        const cssu::Reference<css::frame::XFrame>& rxFrame);
 };
 
 } } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 0d0dd6e..0e25fce 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -117,22 +117,6 @@ namespace sfx2
             Window& i_rParentWindow,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame
         );
-        /** creates a new instance
-            @param i_rParentWindow
-                the parent window
-            @param i_rDocumentFrame
-                the frame to which the task pane belongs. Will be passed to any custom tool panels created
-                via an XUIElementFactory. Also, it is used to determine the module which the task pane is
-                responsible for, thus controlling which tool panels are actually available.
-            @param i_rCompare
-                a comparator for tool panel URLs, which allows controlling the order in which the panels are
-                added to the tool panel deck.
-        */
-        ModuleTaskPane(
-            Window& i_rParentWindow,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame,
-            const IToolPanelCompare& i_rCompare
-        );
         ~ModuleTaskPane();
 
         /** determines whether a given module has any registered tool panels
@@ -154,11 +138,6 @@ namespace sfx2
         ::boost::optional< size_t >
                     GetPanelPos( const OUString& i_rResourceURL );
 
-        /** returns the resource URL of the panel at the specified position
-        */
-        OUString
-                    GetPanelResourceURL( const size_t i_nPanelPos ) const;
-
         /// sets the "classical" layout of the tool panel deck, using drawers
         void    SetDrawersLayout();
         /// sets the new layout of the tool panel deck, using tabs
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 94ff94d..1120b09 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -194,9 +194,7 @@ public:
     void        Append(const SvxColumnDescription& rDesc);
     void        SetLeft(long aLeft);
     void        SetRight(long aRight);
-    void        SetActColumn(sal_uInt16 nCol);
     sal_uInt16  GetActColumn() const;
-    sal_uInt16  GetColumnDescription() const;
     sal_Bool    IsFirstAct() const;
     sal_Bool    IsLastAct() const;
     long        GetLeft();
@@ -204,7 +202,6 @@ public:
     sal_Bool    IsTable() const;
     sal_Bool    CalcOrtho() const;
     void        SetOrtho(sal_Bool bVal);
-    sal_Bool    IsOrtho () const;
     sal_Bool    IsConsistent() const;
 };
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index f46f2aa..8d9f284 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -923,20 +923,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
 
 Reference<XResourceId> FrameworkHelper::CreateResourceId (
     const OUString& rsResourceURL,
-    const OUString& rsFirstAnchorURL,
-    const OUString& rsSecondAnchorURL)
-{
-    ::std::vector<OUString> aAnchorURLs (2);
-    aAnchorURLs[0] = rsFirstAnchorURL;
-    aAnchorURLs[1] = rsSecondAnchorURL;
-    return new ::sd::framework::ResourceId(rsResourceURL, aAnchorURLs);
-}
-
-
-
-
-Reference<XResourceId> FrameworkHelper::CreateResourceId (
-    const OUString& rsResourceURL,
     const Reference<XResourceId>& rxAnchorId)
 {
     if (rxAnchorId.is())
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index f4ba346..fd3f734 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -129,13 +129,6 @@ public:
     */
     void DeactivateSubShell (const ViewShell& rParentShell, ShellId nId);
 
-    /** Move the specified sub shells to the top position among the sub
-        shells of the parent view shell.  The rest of the SFX shell stack
-        does not change (but the all shells above the sub shells have to be
-        taken once off the stack and are then moved back on again.)
-    */
-    void MoveSubShellToTop (const ViewShell& rParentShell, ShellId nId);
-
     /** Send all sub shells of the specified view shell an Invalidate()
         call.  This does not modify the shell stack.
     */
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 33e88c9..b4778dc 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -304,16 +304,6 @@ public:
                 const OUString& rsResourceURL,
                 const OUString& rsAnchorURL);
 
-    /** Create a new XResourceId object for the given resource URL and the
-        two given anchor URLs.
-    */
-    static cssu::Reference<
-        cssdf::XResourceId>
-            CreateResourceId (
-                const OUString& rsResourceURL,
-                const OUString& rsFirstAnchorURL,
-                const OUString& rsSecondAnchorURL);
-
     /** Create a new XResourceId object for the given resource URL.
     */
     static cssu::Reference<
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 6e83aa2..1b74b8f 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -20,7 +20,6 @@
 #include "AllMasterPagesSelector.hxx"
 #include "PreviewValueSet.hxx"
 #include "ViewShellBase.hxx"
-#include "SidebarShellManager.hxx"
 #include "MasterPageContainer.hxx"
 #include "MasterPageDescriptor.hxx"
 #include "app.hrc"
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index dfe4b7c..2295bc9 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -20,7 +20,6 @@
 #include "CurrentMasterPagesSelector.hxx"
 #include "PreviewValueSet.hxx"
 #include "ViewShellBase.hxx"
-#include "SidebarShellManager.hxx"
 #include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index be13bda..ea5ad82 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -19,7 +19,6 @@
 
 #include "LayoutMenu.hxx"
 
-#include "SidebarShellManager.hxx"
 #include "app.hrc"
 #include "drawdoc.hxx"
 #include "framework/FrameworkHelper.hxx"
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index b61550f..e35e3c9 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -58,7 +58,6 @@ namespace sd { namespace sidebar {
 
 class ControlFactory;
 class SidebarViewShell;
-class SidebarShellManager;
 
 
 class LayoutMenu
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 38b9b5c..783d4ed 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -21,7 +21,6 @@
 
 #include "MasterPageContainer.hxx"
 #include "DocumentHelper.hxx"
-#include "SidebarShellManager.hxx"
 #include "pres.hxx"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 83e8091..1c5b085 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -49,7 +49,6 @@ class ViewShellBase;
 namespace sd { namespace sidebar {
 
 class PreviewValueSet;
-class SidebarShellManager;
 
 
 /** Base class of a menu that lets the user select from a list of
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 29ed781..6bf6530 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -23,7 +23,6 @@
 #include "RecentlyUsedMasterPages.hxx"
 #include "MasterPageContainerProviders.hxx"
 #include "MasterPageObserver.hxx"
-#include "SidebarShellManager.hxx"
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
diff --git a/sd/source/ui/sidebar/SidebarShellManager.cxx b/sd/source/ui/sidebar/SidebarShellManager.cxx
deleted file mode 100644
index 526389e..0000000
--- a/sd/source/ui/sidebar/SidebarShellManager.cxx
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "TaskPaneShellManager.hxx"
-
-#include "SidebarShellManager.hxx"
-#include "ViewShellManager.hxx"
-#include <tools/diagnose_ex.h>
-#include <vcl/window.hxx>
-
-#include <algorithm>
-
-namespace sd { namespace sidebar {
-
-SidebarShellManager::SidebarShellManager (
-    const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
-    const ViewShell& rViewShell)
-    : mpViewShellManager(rpViewShellManager),
-      mrViewShell(rViewShell),
-      maSubShells()
-{
-}
-
-
-
-
-SidebarShellManager::~SidebarShellManager (void)
-{
-    while ( ! maSubShells.empty())
-        RemoveSubShell(maSubShells.begin()->second.mpShell);
-}
-
-
-
-
-SfxShell* SidebarShellManager::CreateShell( ShellId nId, ::Window* , FrameView* )
-{
-    SubShells::const_iterator iShell (maSubShells.find(nId));
-    if (iShell != maSubShells.end())
-        return iShell->second.mpShell;
-    else
-        return NULL;
-}
-
-
-
-
-void SidebarShellManager::ReleaseShell (SfxShell* )
-{
-    // Nothing to do.
-}
-
-void SidebarShellManager::AddSubShell (
-    ShellId nId,
-    SfxShell* pShell,
-    ::Window* pWindow)
-{
-    if (pShell != NULL)
-    {
-        maSubShells[nId] = ShellDescriptor(pShell,pWindow);
-        if (pWindow != NULL)
-        {
-            pWindow->AddEventListener(LINK(this,SidebarShellManager,WindowCallback));
-            if (pWindow->IsReallyVisible())
-                mpViewShellManager->ActivateSubShell(mrViewShell, nId);
-        }
-        else
-            mpViewShellManager->ActivateSubShell(mrViewShell, nId);
-    }
-}
-
-
-
-
-void SidebarShellManager::RemoveSubShell (const ShellId i_nShellId)
-{
-    SubShells::iterator pos = maSubShells.find( i_nShellId );
-    ENSURE_OR_RETURN_VOID( pos != maSubShells.end(), "no shell for this ID" );
-    if ( pos->second.mpWindow != NULL )
-    {
-        pos->second.mpWindow->RemoveEventListener( LINK( this, SidebarShellManager, WindowCallback ) );
-    }
-    mpViewShellManager->DeactivateSubShell( mrViewShell, pos->first );
-    maSubShells.erase( pos );
-}
-
-
-
-
-void SidebarShellManager::RemoveSubShell (const SfxShell* pShell)
-{
-    if (pShell != NULL)
-    {
-        SubShells::iterator iShell;
-        for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell)
-            if (iShell->second.mpShell == pShell)
-            {
-                if (iShell->second.mpWindow != NULL)
-                    iShell->second.mpWindow->RemoveEventListener(
-                        LINK(this,SidebarShellManager,WindowCallback));
-                mpViewShellManager->DeactivateSubShell(mrViewShell,iShell->first);
-                maSubShells.erase(iShell);
-                break;
-            }
-    }
-}
-
-
-
-
-void SidebarShellManager::MoveToTop (SfxShell* pShell)
-{
-    SubShells::const_iterator iShell;
-    for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell)
-        if (iShell->second.mpShell == pShell)
-        {
-            ViewShellManager::UpdateLock aLocker (mpViewShellManager);
-            mpViewShellManager->MoveSubShellToTop(mrViewShell,iShell->first);
-            mpViewShellManager->MoveToTop(mrViewShell);
-            break;
-        }
-}
-
-
-
-
-IMPL_LINK(SidebarShellManager, WindowCallback, VclWindowEvent*, pEvent)
-{
-    if (pEvent != NULL)
-    {
-        SubShells::const_iterator iShell;
-        ::Window* pWindow = pEvent->GetWindow();
-        for (iShell=maSubShells.begin(); iShell!=maSubShells.end(); ++iShell)
-            if (iShell->second.mpWindow == pWindow)
-                break;
-        if (iShell != maSubShells.end())
-            switch (pEvent->GetId())
-            {
-                case VCLEVENT_WINDOW_SHOW:
-                    mpViewShellManager->ActivateSubShell(mrViewShell,iShell->first);
-                    break;
-
-                case VCLEVENT_WINDOW_HIDE:
-                    // Do not activate the sub shell.  This leads to
-                    // problems with shapes currently being in text edit
-                    // mode: Deactivating the shell leads to leaving the
-                    // text editing mode.
-                    // mpViewShellManager->DeactivateSubShell(mrViewShell,iShell->first);
-                    break;
-            }
-    }
-
-    return 0;
-}
-
-
-} } // end of namespace ::sd::sidebar
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/SidebarShellManager.hxx b/sd/source/ui/sidebar/SidebarShellManager.hxx
deleted file mode 100644
index eec84c6..0000000
--- a/sd/source/ui/sidebar/SidebarShellManager.hxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SD_SIDEBAR_SHELL_MANAGER_HXX
-#define SD_SIDEBAR_SHELL_MANAGER_HXX
-
-#include "ShellFactory.hxx"
-#include "ViewShellManager.hxx"
-#include <tools/link.hxx>
-#include <map>
-
-class FrameView;
-class SfxShell;
-class VclWindowEvent;
-class Window;
-
-namespace sd {
-class ViewShell;
-}
-
-namespace sd { namespace sidebar {
-
-/** The TaskPaneShellManager implements the ViewShellManager::ShellFactory
-    interface.  However, it does not create or delete shells.  It only
-    gives the ViewShellManager access to the sub shells of the
-    ToolPanelViewShell.  Life time control of the sub shells is managed by
-    the sub shells themselves.
-*/
-class SidebarShellManager
-    : public ShellFactory<SfxShell>
-{
-public:
-    /** Create a shell manager that manages the stacked shells for the given
-        view shell.  It works together with the given view shell manager.
-    */
-    SidebarShellManager (
-        const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
-        const ViewShell& rViewShell);
-    ~SidebarShellManager (void);
-
-    /** Return the requested sub shell.
-        @param nId
-            The id of the requested sub shell.
-        @return
-            When there is no sub shell currently registered under the given
-            id then NULL is returned.
-    */
-    virtual SfxShell* CreateShell (
-        ShellId nId,
-        ::Window* pParentWindow,
-        FrameView* pFrameView = NULL);
-
-    virtual void ReleaseShell (SfxShell* pShell);
-
-    /** Add a sub shell to the set of sub shells managed by the
-        TaskPaneShellManager.  Only shells added by this method are returned
-        by CreateShell().
-    */
-    void AddSubShell (ShellId nId, SfxShell* pShell, ::Window* pWindow);
-
-    /** Remove the given shell from the set of sub shells managed by the
-        TaskPaneShellManager.  Following calls to CreateShell() will return
-        NULL when this shell is requested.
-    */
-    void RemoveSubShell (const SfxShell* pShell);
-    /** removes the shell given by its ID from the set of sub shells managed by the
-        TaskPaneShellManager. Subsequent calls to CreateShell() will return
-        NULL when this shell is requested.
-    */
-    void RemoveSubShell (const ShellId i_nShellId);
-
-    /** Move the given sub-shell to the top of the local shell stack.
-        Furthermore move the view shell whose sub-shells this class manages
-        to the top of the global shell stack.
-    */
-    void MoveToTop (SfxShell* pShell);
-
-    DECL_LINK(WindowCallback,VclWindowEvent*);
-
-private:
-    ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
-
-    /// The view shell whose sub-shells this class manages.
-    const ViewShell& mrViewShell;
-
-    class ShellDescriptor { public:
-        SfxShell* mpShell;
-        ::Window* mpWindow;
-        ShellDescriptor(void) : mpShell(NULL),mpWindow(NULL){}
-        ShellDescriptor(SfxShell*pShell,::Window*pWindow) : mpShell(pShell),mpWindow(pWindow){}
-    };
-    typedef ::std::map<ShellId,ShellDescriptor> SubShells;
-    SubShells maSubShells;
-};
-
-} } // end of namespace ::sd::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 093e6e9..bfb8ef8 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -123,7 +123,6 @@ public:
     void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove);
     void ActivateSubShell (const SfxShell& rParentShell, ShellId nId);
     void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
-    void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId);
     void MoveToTop (const SfxShell& rParentShell);
     SfxShell* GetShell (ShellId nId) const;
     SfxShell* GetTopShell (void) const;
@@ -302,17 +301,6 @@ void ViewShellManager::DeactivateViewShell (const ViewShell* pShell)
 
 
 
-void ViewShellManager::MoveSubShellToTop (
-    const ViewShell& rParentShell,
-    ShellId nId)
-{
-    if (mbValid)
-        mpImpl->MoveSubShellToTop(rParentShell, nId);
-}
-
-
-
-
 void ViewShellManager::SetFormShell (
     const ViewShell* pParentShell,
     FmFormShell* pFormShell,
@@ -709,34 +697,6 @@ void ViewShellManager::Implementation::DeactivateSubShell (
 
 
 
-void ViewShellManager::Implementation::MoveSubShellToTop (
-    const SfxShell& rParentShell,
-    ShellId nId)
-{
-    SubShellList::iterator iList (maActiveSubShells.find(&rParentShell));
-    if (iList != maActiveSubShells.end())
-    {
-        // Look up the sub shell.
-        SubShellSubList& rList (iList->second);
-        SubShellSubList::iterator iShell (
-            ::std::find_if(rList.begin(),rList.end(), IsId(nId)));
-        if (iShell!=rList.end() && iShell!=rList.begin())
-        {
-            SubShellSubList::value_type aEntry (*iShell);
-            rList.erase(iShell);
-            rList.push_front(aEntry);
-        }
-    }
-    else
-    {
-        // Ignore this call when there are no sub shells for the given
-        // parent shell.  We could remember the sub shell to move to the top
-        // but we do not.  Do call this method at a later time instead.
-    }
-}
-
-
-
 void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell)
 {
     ::osl::MutexGuard aGuard (maMutex);
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 98d7ca7..42d9c3a 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -731,14 +731,6 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame,
-            const IToolPanelCompare& i_rCompare )
-        :Window( &i_rParentWindow, WB_DIALOGCONTROL )
-        ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, &i_rCompare ) )
-    {
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
     ModuleTaskPane::~ModuleTaskPane()
     {
     }
@@ -782,12 +774,6 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const
-    {
-        return m_pImpl->GetPanelResourceURL( i_nPanelPos );
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
     void ModuleTaskPane::SetDrawersLayout()
     {
         m_pImpl->SetDrawersLayout();
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index dd7efec..a7ef2cc 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -47,18 +47,6 @@ void Sidebar::ShowPanel (
     }
 }
 
-
-
-
-void Sidebar::ShowDeck (
-    const ::rtl::OUString& rsDeckId,
-    const Reference<frame::XFrame>& rxFrame)
-{
-    SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame);
-    if (pController != NULL)
-        pController->RequestSwitchToDeck(rsDeckId);
-}
-
 } } // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 952437b..3e5d873 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -648,21 +648,11 @@ void SvxColumnItem::SetRight(long right)
     nRight = right;
 }
 
-void SvxColumnItem::SetActColumn(sal_uInt16 nCol)
-{
-    nActColumn = nCol;
-}
-
 sal_uInt16 SvxColumnItem::GetActColumn() const
 {
     return nActColumn;
 }
 
-sal_uInt16 SvxColumnItem::GetColumnDescription() const
-{
-    return nActColumn;
-}
-
 sal_Bool SvxColumnItem::IsFirstAct() const
 {
     return nActColumn == 0;
@@ -747,11 +737,6 @@ void SvxColumnItem::SetOrtho(sal_Bool bVal)
     bOrtho = bVal;
 }
 
-sal_Bool SvxColumnItem::IsOrtho () const
-{
-    return sal_False;
-}
-
 sal_Bool SvxColumnItem::IsConsistent() const
 {
     return nActColumn < aColumns.size();
diff --git a/unusedcode.easy b/unusedcode.easy
index f736e9d..d4daf9c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -11,6 +11,10 @@ EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&)
 FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool)
 ImplRegionBand::IsInside(long, long)
 ImplRegionBand::IsOver(long, long)
+LanguageTag::LanguageTag()
+LanguageTag::convertLangToBcp47()
+LanguageTag::convertLocaleToBcp47()
+LanguageTag::getRegion() const
 LanguageTag::reset(_rtl_Locale const&)
 OutputDevice::GetCanvas() const
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
@@ -38,7 +42,6 @@ ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long)
 ScDPFilteredCache::SingleFilter::getMatchValue() const
 ScDocument::GetCellCount(short, short) const
 ScDocument::GetFormulaTokens(ScAddress const&) const
-ScDocument::GetStringCell(ScAddress const&) const
 ScDocument::IsEmptyData(short, short) const
 ScDocumentImport::setFormulaCell(ScAddress const&, ScTokenArray const&)
 ScEditUtil::GetSpaceDelimitedString(EditTextObject const&)
@@ -48,6 +51,8 @@ ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
 ScMyNotEmptyCellsIterator::GetCell() const
 ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&, rtl::OUString const&, ScDocument const*, formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
 ScRefCellValue::commit(ScColumn&, int) const
+ScSimpleRefDlgWrapper::GetRefString()
+ScTable::SetRawString(short, int, rtl::OUString const&)
 ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 ServerFont::GetGlyphBitmap1(int, RawBitmap&) const
@@ -57,6 +62,12 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno:
 SfxTemplatePanelControl::SetParagraphFamily()
 SmFontPickList::Contains(Font const&) const
 SmParser::Insert(rtl::OUString const&, int)
+String::Append(unsigned short const*)
+String::Append(unsigned short const*, unsigned short)
+String::Assign(unsigned short const*)
+String::Insert(String const&, unsigned short, unsigned short, unsigned short)
+String::SearchAscii(char const*, unsigned short) const
+String::String(char)
 SvdProgressInfo::ReportError()
 SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
 SvpSalInstance::PostedEventsInQueue()
@@ -96,7 +107,6 @@ apitest::XPropertySet::testRemoveVetoableChangeListener()
 apitest::XSheetOutline::testAutoOutline()
 apitest::XSpreadsheetDocument::testGetSheets()
 apitest::XText::testInsertRemoveTextContent()
-basebmp::BitmapDevice::getBufferSize() const
 basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_array<unsigned char> const&, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&)
 basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, basebmp::Format, boost::shared_ptr<std::__debug::vector<basebmp::Color, std::allocator<basebmp::Color> > const> const&)
 basegfx::snapToNearestMultiple(double, double)
@@ -120,10 +130,13 @@ drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
 editeng::MisspellRange::MisspellRange()
 editeng::Section::Section()
 formula::FormulaDlg::CheckMatrix()
+formula::FormulaTokenArray::AddString(unsigned short const*)
 formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long)
 framework::MenuBarManager::getComponentContext()
 framework::MenuManager::getContext()
-jfw_plugin::VendorBase::createInstance()
+linguistic::LinguIsUnspecified(rtl::OUString const&)
+oglcanvas::CanvasHelper::flush() const
+oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
 oox::core::Decrypt::aes128cbc(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&)
 oox::drawingml::TextListStyle::dump() const
 oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
@@ -132,20 +145,29 @@ oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
 rtl_OUString::convertFromString::test()
 sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
 sc::ColumnSet::has(short, short) const
+sc::opencl::OclCalc::mapAndCopyArithmetic32Bits(double const*, int)
+sc::opencl::OclCalc::mapAndCopyArithmetic64Bits(double const*, int)
+sc::opencl::OclCalc::oclHostFormulaCount32Bits(unsigned int*, unsigned int*, double*, int)
+sc::opencl::OclCalc::oclHostFormulaCount64Bits(unsigned int*, unsigned int*, double*&, int)
+sc::opencl::OclCalc::oclHostFormulaSumProduct32Bits(float*, float*, unsigned int*, double*, int)
+sc::opencl::OclCalc::oclHostFormulaSumProduct64Bits(double*, double*, unsigned int*, double*&, int)
+sc::opencl::OclCalc::oclSimpleDeltaOperation(OpCodeEnum, double const*, double const*, unsigned long, double)
+sc::opencl::OpenclDevice::releaseOpenclRunEnv()
+sc::opencl::OpenclDevice::setOpenclState(int)
+sc::opencl::getTimeDiff(TimeValue const&, TimeValue const&)
 sc::sidebar::CellLineStyleValueSet::SetImage(Image)
 sc_apitest::main()
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
-sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
 sd::framework::FrameworkHelper::GetPaneWindow(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&)
 sd::framework::FrameworkHelper::GetResource(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&)
 sd::framework::Pane::SetWindow(Window*)
+sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
 sd::sidebar::LayoutMenu::GetMinimumWidth()
 sd::sidebar::LayoutMenu::GetPreferredSize()
 sd::sidebar::LayoutMenu::GetPreferredWidth(int)
 sdr::overlay::OverlayRectangle::setSecondPosition(basegfx::B2DPoint const&)
 sdr::table::SdrTableObj::getRowCount() const
-sfx2::sidebar::AsynchronousCall::RequestCall(boost::function<void ()> const&)
 sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector<sfx2::sidebar::Context, std::allocator<sfx2::sidebar::Context> > const&) const
 sfx2::sidebar::ContextList::IsEmpty()
 sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&)
@@ -155,13 +177,49 @@ sfx2::sidebar::EnumContext::GetCombinedContext() const
 sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
 sfx2::sidebar::Panel::PrintWindowTree()
 sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
+sfx2::sidebar::TabBar::GetItemForId(rtl::OUString const&)
 std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
 std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
 std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
+svl::SharedStringPool::SharedStringPool()
+svt::ToolPanelDeck::SetAccessibleParentWindow(Window*)
 svx::DialControl::GetModifyHdl() const
 svx::sidebar::LineWidthControl::GetValueSet()
-unoidl::SourceProvider::SourceProvider(rtl::Reference<unoidl::Manager> const&, rtl::OUString const&)
-unoidl::UnoidlProvider::getConstant(unsigned int) const
+test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
 utl::toISO8601(com::sun::star::util::Time const&)
 vclmain::createApplication()
+writerfilter::doctok::CpAndFc::CpAndFc(writerfilter::doctok::Cp const&, writerfilter::doctok::Fc const&, writerfilter::doctok::PropertyType)
+writerfilter::doctok::DffBlock::DffBlock(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int, unsigned int)
+writerfilter::doctok::DffBlock::getBlip(unsigned int)
+writerfilter::doctok::DffBlock::getShape(unsigned int)
+writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int)
+writerfilter::doctok::DffRecord::DffRecord(writerfilter::doctok::WW8StructBase*, unsigned int, unsigned int)
+writerfilter::doctok::DffRecord::calcSize() const
+writerfilter::doctok::DffRecord::getShapeBid()
+writerfilter::doctok::DffRecord::getShapeId()
+writerfilter::doctok::WW8ATRD::init()
+writerfilter::doctok::WW8BKD::init()
+writerfilter::doctok::WW8BKF::init()
+writerfilter::doctok::WW8FFDATA::init()
+writerfilter::doctok::WW8FLD::init()
+writerfilter::doctok::WW8FRD::init()
+writerfilter::doctok::WW8FSPA::init()
+writerfilter::doctok::WW8FTXBXS::init()
+writerfilter::doctok::WW8Fib::init()
+writerfilter::doctok::WW8FibRgFcLcb2000::init()
+writerfilter::doctok::WW8FontTable::init()
+writerfilter::doctok::WW8FontTable::initPayload()
+writerfilter::doctok::WW8LFOTable::init()
+writerfilter::doctok::WW8LFOTable::initPayload()
+writerfilter::doctok::WW8ListTable::init()
+writerfilter::doctok::WW8ListTable::initPayload()
+writerfilter::doctok::WW8PICF::get_DffRecord()
+writerfilter::doctok::WW8PICF::get_ffdata()
+writerfilter::doctok::WW8PICF::init()
+writerfilter::doctok::WW8SED::init()
+writerfilter::doctok::WW8SttbRgtplc::init()
+writerfilter::doctok::WW8SttbTableResource::WW8SttbTableResource(boost::shared_ptr<writerfilter::doctok::WW8Sttbf>)
+writerfilter::doctok::WW8Sttbf::WW8Sttbf(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int)
+writerfilter::doctok::WW8StyleSheet::init()
+writerfilter::doctok::WW8StyleSheet::initPayload()
 writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>)
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 797c193..3e54241 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/doctok/Dff \
     writerfilter/source/doctok/DffImpl \
     writerfilter/source/doctok/WW8Annotation \
-    writerfilter/source/doctok/WW8Clx \
     writerfilter/source/doctok/WW8CpAndFc \
     writerfilter/source/doctok/WW8FKPImpl \
     writerfilter/source/doctok/WW8FontTable \
diff --git a/writerfilter/source/doctok/WW8Clx.cxx b/writerfilter/source/doctok/WW8Clx.cxx
deleted file mode 100644
index bea2d55..0000000
--- a/writerfilter/source/doctok/WW8Clx.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/io/XSeekable.hpp>
-#include <WW8Clx.hxx>
-#include <doctok/resources.hxx>
-
-namespace writerfilter {
-namespace doctok
-{
-WW8Clx::WW8Clx(WW8Stream & rStream,
-               sal_uInt32 nOffset, sal_uInt32 nCount)
-: WW8StructBase(rStream, nOffset, nCount), nOffsetPieceTable(0)
-{
-    while (getU8(nOffsetPieceTable) != 2)
-    {
-        nOffsetPieceTable += getU16(nOffsetPieceTable + 1) + 3;
-    }
-}
-
-sal_uInt32 WW8Clx::getPieceCount() const
-{
-    return (getU32(nOffsetPieceTable + 1) - 4) / 12;
-}
-
-sal_uInt32 WW8Clx::getCp(sal_uInt32 nIndex) const
-{
-    return getU32(nOffsetPieceTable + 5 + nIndex * 4);
-}
-
-sal_uInt32 WW8Clx::getFc(sal_uInt32 nIndex) const
-{
-    sal_uInt32 nResult = getU32(nOffsetPieceTable + 5 +
-                                (getPieceCount() + 1) * 4 +
-                                nIndex * 8 + 2);
-
-    if (nResult & 0x40000000)
-        nResult = (nResult & ~0x40000000) / 2;
-
-    return nResult;
-}
-
-sal_Bool WW8Clx::isComplexFc(sal_uInt32 nIndex) const
-{
-    sal_Bool bResult = sal_False;
-    sal_uInt32 nTmp = getU32(nOffsetPieceTable + 5 +
-                             (getPieceCount() + 1) * 4 +
-                             nIndex * 8 + 2);
-    if (nTmp & 0x40000000)
-        bResult = sal_True;
-
-    return bResult;
-}
-
-void WW8Clx::dump(OutputWithDepth<string> & o) const
-{
-    WW8StructBase::dump(o);
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/WW8Clx.hxx b/writerfilter/source/doctok/WW8Clx.hxx
deleted file mode 100644
index b15c5e2..0000000
--- a/writerfilter/source/doctok/WW8Clx.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_WW8_CLX_HXX
-#define INCLUDED_WW8_CLX_HXX
-
-#include <doctok/resources.hxx>
-
-namespace writerfilter {
-namespace doctok
-{
-
-/**
-   Piece table as stored in a Word file.
-
-   It contains character positions (CPs) and file character positions
-   (FCs). Each CP is correlated to one FC.
- */
-class WW8Clx : public WW8StructBase
-{
-    /// Pointer to the file information block.
-    WW8Fib::Pointer_t pFib;
-
-    /// Offset where FCs begin
-    sal_uInt32 nOffsetPieceTable;
-
-public:
-    /// Pointer to Clx.
-    typedef boost::shared_ptr<WW8Clx> Pointer_t;
-
-    WW8Clx(WW8Stream & rStream,
-           sal_uInt32 nOffset, sal_uInt32 nCount);
-
-    virtual void dump(OutputWithDepth<string> & o) const;
-
-    /**
-       Return the number of pieces.
-    */
-    sal_uInt32 getPieceCount() const;
-
-    /**
-       Return a certain character position.
-
-       @param nIndex     index of the character position
-     */
-    sal_uInt32 getCp(sal_uInt32 nIndex) const;
-
-    /**
-       Return a certain file character position.
-
-       @param nIndex     index of the file character position
-     */
-    sal_uInt32 getFc(sal_uInt32 nIndex) const;
-
-    /**
-       Return if a certain FC is complex.
-
-       @nIndex           index of the FC
-     */
-    sal_Bool isComplexFc(sal_uInt32 nIndex) const;
-
-};
-}}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5089bdb234a93bcb62b597c18b8ab66048246b13
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 9 09:50:37 2013 +0100

    Related: fdo#38838 remove UniString::EqualsAscii
    
    Change-Id: I55c85c1c44452c7fb6ac40591aea7177d054affe

diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index fc15b09..f596531 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -417,6 +417,38 @@ sal_Int32 indexOfAny(OUString const& rIn,
     return -1;
 }
 
+OUString setToken(const OUString& rIn, sal_Int32 nToken, sal_Unicode cTok,
+    const OUString& rNewToken)
+{
+    const sal_Unicode* pStr = rIn.getStr();
+    sal_Int32 nLen = rIn.getLength();
+    sal_Int32 nTok = 0;
+    sal_Int32 nFirstChar = 0;
+    sal_Int32 i = 0;
+
+    // Determine token position and length
+    while ( i < nLen )
+    {
+        // Increase token count if match
+        if (*pStr == cTok)
+        {
+            ++nTok;
+
+            if (nTok == nToken)
+                nFirstChar = i+1;
+            else if (nTok > nToken)
+                break;
+        }
+
+        ++pStr,
+        ++i;
+    }
+
+    if (nTok >= nToken)
+        return rIn.replaceAt(nFirstChar, i-nFirstChar, rNewToken);
+    return rIn;
+}
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index e599509..73f3ab9 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -285,6 +285,17 @@ COMPHELPER_DLLPUBLIC inline OUStringBuffer& padToLength(
     return detail::padToLength(rBuffer, nLength, cFill);
 }
 
+/** Replace a token in a string
+    @param rIn       OUString in which the token is to be replaced
+    @param nToken    which nToken to replace
+    @param cTok      token delimiter
+    @param rNewToken replacement token
+
+    @return original string with token nToken replaced by rNewToken
+ */
+COMPHELPER_DLLPUBLIC OUString setToken(const OUString& rIn, sal_Int32 nToken, sal_Unicode cTok,
+    const OUString& rNewToken);
+
 /** Find any of a list of code units in the string.
     @param rIn      OUString to search
     @param pChars   0-terminated array of sal_Unicode code units to search for
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 75aa0b8..008a822 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -230,11 +230,8 @@ public:
     StringCompare       CompareToAscii( const sal_Char* pAsciiStr,
                                         xub_StrLen nLen = STRING_LEN ) const;
     sal_Bool            Equals( const UniString& rStr ) const;
-    sal_Bool            EqualsAscii( const sal_Char* pAsciiStr ) const;
     sal_Bool            Equals( const UniString& rStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    sal_Bool            EqualsAscii( const sal_Char* pAsciiStr,
-                                     xub_StrLen nIndex, xub_StrLen nLen ) const;
 
     xub_StrLen          Match( const UniString& rStr ) const;
 
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 39ca15f..b47ba35 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -46,20 +46,19 @@
 
 struct SwIoDetect
 {
-    const sal_Char* pName;
-    sal_uInt16 nLen;
+    const OUString sName;
 
-    inline SwIoDetect( const sal_Char *pN, sal_uInt16 nL )
-        : pName( pN ), nLen( nL )
-    {}
+    SwIoDetect(const OUString &rN)
+        : sName(rN)
+    {
+    }
 
-    inline int IsFilter( const String& rNm ) const
+    bool IsFilter( const OUString& rNm ) const
     {
-        return pName && rNm.EqualsAscii( pName, 0, nLen );
+        return rNm.startsWith(sName);
     }
 
-    const sal_Char* IsReader( const sal_Char* pHeader, sal_uLong nLen_,
-            const String &rFileName, const String& rUserData ) const;
+    OUString IsReader(const sal_Char* pHeader, sal_uLong nLen_) const;
 };
 
 enum ReaderWriterEnum {
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 793cad6..66e81f8 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -57,7 +57,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
 
     //Names of TOXs.
     String          aTOXIndexName;
-    String          aTOXUserName;
+    OUString        aTOXUserName;
     String          aTOXContentName;
     String          aTOXIllustrationsName;
     String          aTOXObjectsName;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index f411842..14dc73c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2590,44 +2590,40 @@ SwXTextFieldMasters::~SwXTextFieldMasters()
     Falls wir grosszuegig werden wollen, dann koennte man com.sun.star.text
     auch optional weglassen
   -----------------------------------------------------------------------*/
-static sal_uInt16 lcl_GetIdByName( String& rName, String& rTypeName )
+static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
 {
-    if( rName.EqualsAscii( COM_TEXT_FLDMASTER, 0, RTL_CONSTASCII_LENGTH(COM_TEXT_FLDMASTER ))
-        ||  rName.EqualsAscii( COM_TEXT_FLDMASTER_CC, 0, RTL_CONSTASCII_LENGTH(COM_TEXT_FLDMASTER_CC )))
-        rName.Erase(0, 30);
+    if (rName.startsWith(COM_TEXT_FLDMASTER) || rName.startsWith(COM_TEXT_FLDMASTER_CC))
+        rName = rName.copy(30);
 
     sal_uInt16 nResId = USHRT_MAX;
     sal_Int32 nFound = 0;
-    rTypeName = rName.GetToken( 0, '.', nFound );
-    if(rTypeName.EqualsAscii("User"))
+    rTypeName = rName.getToken( 0, '.', nFound );
+    if (rTypeName == "User")
         nResId = RES_USERFLD;
-    else if(rTypeName.EqualsAscii("DDE"))
+    else if (rTypeName == "DDE")
         nResId = RES_DDEFLD;
-    else if(rTypeName.EqualsAscii("SetExpression"))
+    else if (rTypeName == "SetExpression")
     {
         nResId = RES_SETEXPFLD;
 
-        String sFldTypName( rName.GetToken( 1, '.' ));
+        String sFldTypName( rName.getToken( 1, '.' ));
         String sUIName( SwStyleNameMapper::GetSpecialExtraUIName( sFldTypName ) );
 
         if( sUIName != sFldTypName )
-            rName.SetToken( 1, '.', sUIName );
+            rName = comphelper::string::setToken(rName, 1, '.', sUIName);
     }
-    else if(rTypeName.EqualsAscii("DataBase"))
+    else if (rTypeName == "DataBase")
     {
-        rName.Erase( 0, RTL_CONSTASCII_LENGTH( "DataBase." ));
+        rName = rName.copy(RTL_CONSTASCII_LENGTH("DataBase."));
         sal_uInt16 nDotCount = comphelper::string::getTokenCount(rName, '.');
         if( 2 <= nDotCount )
         {
             // #i51815#
-            //rName.SearchAndReplace('.', DB_DELIM);
-            //rName.SetChar( rName.SearchBackward( '.' ), DB_DELIM );
-
             rName = OUString("DataBase.") + rName;
             nResId = RES_DBFLD;
         }
     }
-    else if( rTypeName.EqualsAscii("Bibliography"))
+    else if (rTypeName == "Bibliography")
         nResId = RES_AUTHORITY;
     return nResId;
 }
@@ -2639,12 +2635,12 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
     if(!GetDoc())
         throw uno::RuntimeException();
 
-    String sName(rName), sTypeName;
+    OUString sName(rName), sTypeName;
     sal_uInt16 nResId = lcl_GetIdByName( sName, sTypeName );
     if( USHRT_MAX == nResId )
         throw container::NoSuchElementException();
 
-    sName.Erase(0, sTypeName.Len()+1);
+    sName = sName.copy(sTypeName.getLength()+1);
     SwFieldType* pType = GetDoc()->GetFldType(nResId, sName, sal_True);
     if(!pType)
         throw container::NoSuchElementException();
@@ -2726,12 +2722,12 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti
     if(!GetDoc())
         throw uno::RuntimeException();
 
-    String sName(rName), sTypeName;
+    OUString sName(rName), sTypeName;
     sal_uInt16 nResId = lcl_GetIdByName( sName, sTypeName );
     sal_Bool bRet = sal_False;
     if( USHRT_MAX != nResId )
     {
-        sName.Erase(0, sTypeName.Len()+1);
+        sName = sName.copy(sTypeName.getLength()+1);
         bRet = USHRT_MAX != nResId && 0 != GetDoc()->GetFldType(nResId, sName, sal_True);
     }
     return bRet;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 0dad757..d392908 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -160,11 +160,11 @@ static void
 lcl_ConvertTOUNameToUserName(OUString& rTmp)
 {
     ShellResource* pShellRes = ViewShell::GetShellRes();
-    if(rTmp.equalsAscii(cUserDefined))
+    if (rTmp.equalsAscii(cUserDefined))
     {
         rTmp = pShellRes->aTOXUserName;
     }
-    else if(!pShellRes->aTOXUserName.EqualsAscii(cUserDefined) &&
+    else if (!pShellRes->aTOXUserName.equalsAscii(cUserDefined) &&
         USER_AND_SUFFIXLEN == rTmp.getLength())
     {
         //make sure that in non-English versions the " (user)" suffix is removed
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 6bb1643..ea681fa 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -29,21 +29,20 @@ bool IsDocShellRegistered();
 
 SwIoDetect aFilterDetect[] =
 {
-    SwIoDetect( FILTER_RTF,      STRING_LEN ),
-    SwIoDetect( FILTER_BAS,      STRING_LEN ),
-    SwIoDetect( sWW6,            STRING_LEN ),
-    SwIoDetect( FILTER_WW8,      STRING_LEN ),
-    SwIoDetect( sRtfWH,          STRING_LEN ),
-    SwIoDetect( sHTML,           4 ),
-    SwIoDetect( sWW1,            STRING_LEN ),
-    SwIoDetect( sWW5,            STRING_LEN ),
-    SwIoDetect( FILTER_XML,      4 ),
-    SwIoDetect( FILTER_TEXT_DLG, 8 ),
-    SwIoDetect( FILTER_TEXT,     4 )
+    SwIoDetect( FILTER_RTF ),
+    SwIoDetect( FILTER_BAS ),
+    SwIoDetect( sWW6 ),
+    SwIoDetect( FILTER_WW8 ),
+    SwIoDetect( sRtfWH ),
+    SwIoDetect( sHTML ),
+    SwIoDetect( sWW1 ),
+    SwIoDetect( sWW5 ),
+    SwIoDetect( FILTER_XML ),
+    SwIoDetect( FILTER_TEXT_DLG ),
+    SwIoDetect( FILTER_TEXT )
 };
 
-const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_,
-    const String & /*rFileName*/, const String& /*rUserData*/) const
+OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const
 {
     // Filter erkennung
     struct W1_FIB
@@ -63,12 +62,11 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_,
     };
 
     int bRet = sal_False;
-    OString aName( pName );
-    if ( sHTML == aName )
+    if ( sHTML == sName )
         bRet = HTMLParser::IsHTMLFormat( pHeader, sal_True, RTL_TEXTENCODING_DONTKNOW );
-    else if ( FILTER_RTF == aName )
+    else if ( FILTER_RTF == sName )
         bRet = 0 == strncmp( "{\\rtf", pHeader, 5 );
-    else if ( sWW5 == aName )
+    else if ( sWW5 == sName )
     {
         W1_FIB *pW1Header = (W1_FIB*)pHeader;
         if (pW1Header->wIdentGet() == 0xA5DC && pW1Header->nFibGet() == 0x65)
@@ -76,17 +74,17 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_,
         else if (pW1Header->wIdentGet() == 0xA5DB && pW1Header->nFibGet() == 0x2D)
             bRet = true; /*WW2*/
     }
-    else if ( sWW1 == aName )
+    else if ( sWW1 == sName )
     {
         bRet = (( ((W1_FIB*)pHeader)->wIdentGet() == 0xA59C
                     && ((W1_FIB*)pHeader)->nFibGet() == 0x21)
                 && ((W1_FIB*)pHeader)->fComplexGet() == 0);
     }
-    else if ( FILTER_TEXT == aName )
+    else if ( FILTER_TEXT == sName )
         bRet = SwIoSystem::IsDetectableText(pHeader, nLen_);
-    else if ( FILTER_TEXT_DLG == aName)
+    else if ( FILTER_TEXT_DLG == sName)
         bRet = SwIoSystem::IsDetectableText( pHeader, nLen_, 0, 0, 0, true);
-    return bRet ? pName : 0;
+    return bRet ? sName : OUString();
 }
 
 const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
@@ -244,8 +242,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
                     {
                         if (aFilterDetect[i].IsFilter(rFmtName))
                         {
-                            bRet = 0 != aFilterDetect[i].IsReader( aBuffer, nBytesRead,
-                                    rMedium.GetPhysicalName(), rUserData );
+                            OUString sFilter(aFilterDetect[i].IsReader(aBuffer, nBytesRead));
+                            bRet = !sFilter.isEmpty();
                             break;
                         }
                     }
@@ -382,14 +380,12 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
     /* nie erkannt und es wird auch der ASCII-Filter returnt.             */
     /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
     {
-        const SfxFilter* pFilterTmp = 0;
-        const sal_Char* pNm;
         for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
         {
-            String sEmptyUserData;
-            pNm = aFilterDetect[n].IsReader(aBuffer, nBytesRead, rFileName, sEmptyUserData);
-            pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(OUString::createFromAscii(pNm), pFCntnr) : 0;
-            if (pNm && pFilterTmp)
+            OUString sNm(aFilterDetect[n].IsReader(aBuffer, nBytesRead));
+            const SfxFilter* pFilterTmp =
+                sNm.isEmpty() ? 0 : SwIoSystem::GetFilterOfFormat(sNm, pFCntnr);
+            if (pFilterTmp)
             {
                 return pFilterTmp;
             }
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 0254957..915887f 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1692,7 +1692,7 @@ _HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich )
 
 void SwHTMLParser::NewStyle()
 {
-    String sType;
+    OUString sType;
 
     const HTMLOptions& rOptions2 = GetOptions();
     for (size_t i = rOptions2.size(); i; )
@@ -1702,8 +1702,8 @@ void SwHTMLParser::NewStyle()
             sType = rOption.GetString();
     }
 
-    bIgnoreRawData = sType.Len() &&
-                     !sType.GetToken(0,';').EqualsAscii(sCSS_mimetype);
+    bIgnoreRawData = !sType.getLength() &&
+                     !sType.getToken(0,';').equalsAscii(sCSS_mimetype);
 }
 
 void SwHTMLParser::EndStyle()
@@ -1778,8 +1778,7 @@ void SwHTMLParser::InsertLink()
     }
     else
     {
-        OUString sRel;
-        String sHRef, sType;
+        OUString sRel, sHRef, sType;
 
         const HTMLOptions& rOptions2 = GetOptions();
         for (size_t i = rOptions2.size(); i; )
@@ -1799,9 +1798,9 @@ void SwHTMLParser::InsertLink()
             }
         }
 
-        if( sHRef.Len() && sRel.equalsIgnoreAsciiCase( "STYLESHEET" ) &&
-            ( !sType.Len() ||
-              sType.GetToken(0,';').EqualsAscii(sCSS_mimetype) ) )
+        if( !sHRef.isEmpty() && sRel.equalsIgnoreAsciiCase( "STYLESHEET" ) &&
+            ( sType.isEmpty() ||
+              sType.getToken(0,';').equalsAscii(sCSS_mimetype) ) )
         {
             if( GetMedium() )
             {
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index d180338..dac331c 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -489,7 +489,8 @@ void SwHTMLParser::InsertEmbed()
 #if HAVE_FEATURE_JAVA
 void SwHTMLParser::NewObject()
 {
-    String aClassID, aName, aStandBy, aId, aStyle, aClass;
+    OUString aClassID;
+    String aName, aStandBy, aId, aStyle, aClass;
     Size aSize( USHRT_MAX, USHRT_MAX );
     Size aSpace( 0, 0 );
     sal_Int16 eVertOri = text::VertOrientation::TOP;
@@ -581,10 +582,10 @@ void SwHTMLParser::NewObject()
     // Java applets are supported.
     sal_Bool bIsApplet = sal_False;
 
-    if( !bDeclare && aClassID.Len() == 42 &&
-        aClassID.EqualsAscii( "clsid:", 0, 6 ) )
+    if( !bDeclare && aClassID.getLength() == 42 &&
+        aClassID.startsWith("clsid:") )
     {
-        aClassID.Erase( 0, 6 );
+        aClassID = aClassID.copy(6);
         SvGlobalName aCID;
         if( aCID.MakeId( aClassID ) )
         {
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 71b322d..b3fce48 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -31,11 +31,11 @@ namespace
     class SameName: public std::unary_function<const sal_Char*, bool>
     {
     private:
-        const String &mrName;
+        const OUString &mrName;
     public:
-        explicit SameName(const String &rName) : mrName(rName) {}
+        explicit SameName(const OUString &rName) : mrName(rName) {}
         bool operator() (const sal_Char *pEntry) const
-            { return mrName.EqualsAscii(pEntry); }
+            { return mrName.equalsAscii(pEntry); }
     };
 
     const sal_Char **GetStiNames() throw()
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 471964a..bdd05e9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3452,9 +3452,9 @@ MSWordSections& WW8Export::Sections() const
     return *pSepx;
 }
 
-SwWW8Writer::SwWW8Writer(const String& rFltName, const String& rBaseURL)
+SwWW8Writer::SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL)
     : StgWriter(),
-      m_bWrtWW8( rFltName.EqualsAscii( FILTER_WW8 ) ),
+      m_bWrtWW8( rFltName == FILTER_WW8 ),
       m_pExport( NULL ),
       mpMedium( 0 )
 {
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index b7f4c5c..72735c3 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -858,7 +858,7 @@ friend void WW8_WrtRedlineAuthor::Write(Writer &rWrt);
     SfxMedium *mpMedium;
 
 public:
-    SwWW8Writer( const String& rFltName, const String& rBaseURL );
+    SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL);
     virtual ~SwWW8Writer();
 
     virtual sal_uLong WriteStorage();
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4023dcb..bc60d6e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2051,18 +2051,18 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
 //helper function
 //For MS MacroButton field, the symbol in plain text is always "(" (0x28),
 //which should be mapped according to the macro type
-bool ConvertMacroSymbol( const String& rName, OUString& rReference )
+bool ConvertMacroSymbol( const OUString& rName, OUString& rReference )
 {
     bool bConverted = false;
     if( rReference == "(" )
     {
         bConverted = true;
         sal_Unicode cSymbol = sal_Unicode(); // silence false warning
-        if( rName.EqualsAscii( "CheckIt" ) )
+        if (rName == "CheckIt")
             cSymbol = 0xF06F;
-        else if( rName.EqualsAscii( "UncheckIt" ) )
+        else if (rName == "UncheckIt")
             cSymbol = 0xF0FE;
-        else if( rName.EqualsAscii( "ShowExample" ) )
+        else if (rName == "ShowExample")
             cSymbol = 0xF02A;
         //else if... : todo
         else
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 63be879..b31c1d9 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -59,34 +59,34 @@ SW_DLLPUBLIC String MakeSender()
     bool bLastLength = true;
     for( xub_StrLen i = 0; i < nTokenCount; i++ )
     {
-        String sToken = sSenderToken.GetToken( 0, ';', nSttPos );
-        if(sToken.EqualsAscii("COMPANY"))
+        OUString sToken = sSenderToken.GetToken( 0, ';', nSttPos );
+        if (sToken == "COMPANY")
         {
             xub_StrLen nOldLen = sRet.Len();
             sRet += (String)rUserOpt.GetCompany();
             bLastLength = sRet.Len() != nOldLen;
         }
-        else if(sToken.EqualsAscii("CR"))
+        else if (sToken == "CR")
         {
             if(bLastLength)
                 sRet +=NEXTLINE;
             bLastLength = true;
         }
-        else if(sToken.EqualsAscii("FIRSTNAME"))
+        else if (sToken == "FIRSTNAME")
             sRet += (String)rUserOpt.GetFirstName();
-        else if(sToken.EqualsAscii("LASTNAME"))
+        else if (sToken == "LASTNAME")
             sRet += (String)rUserOpt.GetLastName();
-        else if(sToken.EqualsAscii("ADDRESS"))
+        else if (sToken == "ADDRESS")
             sRet += (String)rUserOpt.GetStreet();
-        else if(sToken.EqualsAscii("COUNTRY"))
+        else if (sToken == "COUNTRY")
             sRet += (String)rUserOpt.GetCountry();
-        else if(sToken.EqualsAscii("POSTALCODE"))
+        else if (sToken == "POSTALCODE")
             sRet += (String)rUserOpt.GetZip();
-        else if(sToken.EqualsAscii("CITY"))
+        else if (sToken == "CITY")
             sRet += (String)rUserOpt.GetCity();
-        else if(sToken.EqualsAscii("STATEPROV"))
+        else if (sToken == "STATEPROV")
             sRet += (String)rUserOpt.GetState();
-        else if(sToken.Len()) //spaces
+        else if (!sToken.isEmpty()) //spaces
             sRet += sToken;
     }
     return sRet;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index aba46b3..e71e398 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -253,19 +253,12 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
  --------------------------------------------------------------------*/
 void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
 {
-    String sTmp(rDBData.sDataSource);
-    String sName;
-    sTmp += '.';
-    sTmp += (String)rDBData.sCommand;
+    OUString sTmp(rDBData.sDataSource);
+    sTmp += ".";
+    sTmp += rDBData.sCommand;
 
-    for (sal_uInt16 i = 0; i < sTmp.Len(); i++)
-    {
-        sName += sTmp.GetChar(i);
-        if (sTmp.GetChar(i) == '~')
-            sName += '~';
-    }
-
-    if (sName.EqualsAscii(".")) //empty
+    OUString sName(sTmp.replaceAll("~", "~~"));
+    if (sName == ".") //empty
         sName = SW_RESSTR(SW_STR_NONE);
 
     m_pDocDBNameFT->SetText(sName);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3064a95..53d55c0 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1088,8 +1088,8 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
     }
     else if(TOX_AUTHORITIES == aCurType.eType)
     {
-        String sBrackets(rDesc.GetAuthBrackets());
-        if(!sBrackets.Len() || sBrackets.EqualsAscii("  "))
+        OUString sBrackets(rDesc.GetAuthBrackets());
+        if(sBrackets.isEmpty() || sBrackets == "  ")
             m_pBracketLB->SelectEntryPos(0);
         else
             m_pBracketLB->SelectEntry(sBrackets);
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index 3361575..bea63a8 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -111,7 +111,7 @@ namespace SwLangHelper
         EditEngine * pEditEngine = rEditView.GetEditEngine();
 
         // get the language
-        String aNewLangTxt;
+        OUString aNewLangTxt;
 
         SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False );
         if (pItem)
@@ -122,7 +122,7 @@ namespace SwLangHelper
         //!! SwTextShell got destroyed meanwhile.)
         SfxViewFrame *pViewFrame = rView.GetViewFrame();
 
-        if (aNewLangTxt.EqualsAscii( "*" ))
+        if (aNewLangTxt == "*" )
         {
             // open the dialog "Tools/Options/Language Settings - Language"
             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
@@ -136,7 +136,7 @@ namespace SwLangHelper
         else
         {
             // setting the new language...
-            if (aNewLangTxt.Len() > 0)
+            if (!aNewLangTxt.isEmpty())
             {
                 const OUString aSelectionLangPrefix("Current_");
                 const OUString aParagraphLangPrefix("Paragraph_");
@@ -144,26 +144,26 @@ namespace SwLangHelper
                 const String aStrNone( OUString("LANGUAGE_NONE") );
                 const String aStrResetLangs( OUString("RESET_LANGUAGES") );
 
-                xub_StrLen nPos = 0;
+                sal_Int32 nPos = 0;
                 bool bForSelection = true;
                 bool bForParagraph = false;
-                if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aSelectionLangPrefix, 0 )))
+                if (-1 != (nPos = aNewLangTxt.indexOf( aSelectionLangPrefix, 0 )))
                 {
                     // ... for the current selection
-                    aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.getLength() );
+                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
                     bForSelection = true;
                 }
-                else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aParagraphLangPrefix , 0 )))
+                else if (-1 != (nPos = aNewLangTxt.indexOf( aParagraphLangPrefix , 0 )))
                 {
                     // ... for the current paragraph language
-                    aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.getLength() );
+                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
                     bForSelection = true;
                     bForParagraph = true;
                 }
-                else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aDocumentLangPrefix , 0 )))
+                else if (-1 != (nPos = aNewLangTxt.indexOf( aDocumentLangPrefix , 0 )))
                 {
                     // ... as default document language
-                    aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.getLength() );
+                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
                     bForSelection = false;
                 }
 
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index c018b5f..af18041 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -291,7 +291,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case SID_LANGUAGE_STATUS:
         {
             // get the language
-            String aNewLangTxt;
+            OUString aNewLangTxt;
             SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , sal_False );
             if (pItem2)
                 aNewLangTxt = pItem2->GetValue();
@@ -301,7 +301,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             //!! SwTextShell got destroyed meanwhile.)
             SfxViewFrame *pViewFrame = GetView().GetViewFrame();
 
-            if (aNewLangTxt.EqualsAscii( "*" ))
+            if (aNewLangTxt == "*")
             {
                 // open the dialog "Tools/Options/Language Settings - Language"
                 // to set the documents default language
@@ -326,7 +326,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 rWrtSh.Push();
 
                 // setting the new language...
-                if (aNewLangTxt.Len() > 0)
+                if (!aNewLangTxt.isEmpty())
                 {
                     const OUString aSelectionLangPrefix("Current_");
                     const OUString aParagraphLangPrefix("Paragraph_");
@@ -340,26 +340,26 @@ void SwTextShell::Execute(SfxRequest &rReq)
                             RES_CHRATR_CTL_LANGUAGE,    RES_CHRATR_CTL_LANGUAGE,
                             0 );
 
-                    xub_StrLen nPos = 0;
+                    sal_Int32 nPos = 0;
                     bool bForSelection = true;
                     bool bForParagraph = false;
-                    if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aSelectionLangPrefix, 0 )))
+                    if (-1 != (nPos = aNewLangTxt.indexOf( aSelectionLangPrefix, 0 )))
                     {
                         // ... for the current selection
-                        aNewLangTxt = aNewLangTxt.Erase( nPos, aSelectionLangPrefix.getLength() );
+                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
                         bForSelection = true;
                     }
-                    else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aParagraphLangPrefix , 0 )))
+                    else if (-1 != (nPos = aNewLangTxt.indexOf(aParagraphLangPrefix, 0)))
                     {
                         // ... for the current paragraph language
-                        aNewLangTxt = aNewLangTxt.Erase( nPos, aParagraphLangPrefix.getLength() );
+                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
                         bForSelection = true;
                         bForParagraph = true;
                     }
-                    else if (STRING_NOTFOUND != (nPos = aNewLangTxt.Search( aDocumentLangPrefix , 0 )))
+                    else if (-1 != (nPos = aNewLangTxt.indexOf(aDocumentLangPrefix, 0)))
                     {
                         // ... as default document language
-                        aNewLangTxt = aNewLangTxt.Erase( nPos, aDocumentLangPrefix.getLength() );
+                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
                         bForSelection = false;
                     }
 
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx
index 56e7122..5ae3967 100644
--- a/tools/source/string/strascii.cxx
+++ b/tools/source/string/strascii.cxx
@@ -47,19 +47,6 @@ static void ImplCopyAsciiStr( sal_Unicode* pDest, const sal_Char* pSrc,
     }
 }
 
-static sal_Int32 ImplStringCompareAscii( const sal_Unicode* pStr1, const sal_Char* pStr2 )
-{
-    sal_Int32 nRet;
-    while ( ((nRet = ((sal_Int32)*pStr1)-((sal_Int32)((unsigned char)*pStr2))) == 0) &&
-            *pStr2 )
-    {
-        ++pStr1,
-        ++pStr2;
-    }
-
-    return nRet;
-}
-
 static sal_Int32 ImplStringCompareAscii( const sal_Unicode* pStr1, const sal_Char* pStr2,
                                          xub_StrLen nCount )
 {
@@ -181,29 +168,6 @@ StringCompare UniString::CompareToAscii( const sal_Char* pAsciiStr,
         return COMPARE_GREATER;
 }
 
-sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr ) const
-{
-    DBG_CHKTHIS( UniString, DbgCheckUniString );
-    DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ),
-                "UniString::EqualsAscii() - pAsciiStr include characters > 127" );
-
-    return (ImplStringCompareAscii( mpData->maStr, pAsciiStr ) == 0);
-}
-
-sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr,
-                             xub_StrLen nIndex, xub_StrLen nLen ) const
-{
-    DBG_CHKTHIS( UniString, DbgCheckUniString );
-    DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, nLen ),
-                "UniString::EqualsAscii() - pAsciiStr include characters > 127" );
-
-    // Are there enough codes for comparing?
-    if ( nIndex > mpData->mnLen )
-        return (*pAsciiStr == 0);
-
-    return (ImplStringCompareAscii( mpData->maStr+nIndex, pAsciiStr, nLen ) == 0);
-}
-
 xub_StrLen UniString::SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex ) const
 {
     DBG_CHKTHIS( UniString, DbgCheckUniString );
commit 0ba03a38f022ca8d3705ae1370bb1d739e1e973f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 9 11:15:02 2013 +0100

    stray ' in string
    
    regression since 55a15541a17e5c9b49039b0db31473ab81c2456b
    
    Change-Id: I9c5853061eef5befba7644ea0ca05b7751addc6c

diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index eb54d3c..7d9bc2b 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -3056,7 +3056,7 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
         OUString aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
 
         aStr += OUString::number((sal_Int32)rColor.GetRed());
-        aStr += " '";
+        aStr += " ";
         aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_G);
         aStr += OUString::number((sal_Int32)rColor.GetGreen());
         aStr += " ";
commit 42849b8e9048c52f05bff352a0691389fe495e96
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 9 09:20:31 2013 +0100

    extend callanalyse to instdir
    
    Change-Id: Iee5c5ae3751d57c39e3dd1bcd1073a0e722bf575

diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 3720139..fc11e54 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -25,7 +25,9 @@ include $(SOLARENV)/gbuild/gbuild.mk
 findunusedcode:
 	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
 	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
-	callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
+	callanalyse \
+	  $(SRCDIR)/instdir/callcatcher/program/* \
+	  $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
 	  $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
 	  > unusedcode.all
 


More information about the Libreoffice-commits mailing list