[Libreoffice-commits] .: 2 commits - cui/source sw/source unusedcode.easy

[Libreoffice Gerrit user]

 cui/source/options/optdict.cxx           |   12 ++++++------
 sw/source/core/text/guess.cxx            |    2 +-
 sw/source/core/txtnode/txtedt.cxx        |    2 +-
 sw/source/ui/docvw/AnnotationWin.cxx     |    2 +-
 sw/source/ui/docvw/SidebarTxtControl.cxx |    2 +-
 unusedcode.easy                          |    5 ++---
 6 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit bfe49bf54812a70bcd9ac16342ff02bfd50f475b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 26 01:32:30 2013 +0000

    callcatcher: update unused code
    
    Change-Id: I80e562eac2b8578073993c5ebf01943ecad4947d

diff --git a/unusedcode.easy b/unusedcode.easy
index 2c9880d..bbef784 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,18 +1,17 @@
 Application::GetDisplayScreenName(unsigned int)
-BackgroundPreviewImpl::BackgroundPreviewImpl(Window*, ResId const&, unsigned char)
 EditTextObject::RemoveParaAttribs(unsigned short)
 EditTextObject::SetParaAttribs(unsigned long, SfxItemSet const&)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
 Line::Intersection(Rectangle const&, Line&) const
 PoHeader::PoHeader()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-ScFiltersTest::testCachedMatrixFormulaResultsODS()
 ScFiltersTest::testColorScaleODS()
 ScFiltersTest::testColorScaleXLSX()
-ScFiltersTest::testVolatileFunctionsODS()
 ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 StyleSettings::GetPersonaFooter() const
+SvxBrushItem::SetFillStyle(com::sun::star::drawing::FillStyle)
+SvxBrushItem::SetGradient(Gradient&)
 TemplateAbstractView::deselectOverlayItem(unsigned short)
 Test::test1Table1Page()
 TextEngine::GetLeftMargin() const
commit 9b5111e7f91f958e37ab25280d678afb9de4bead
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 25 23:01:35 2013 +0000

    get rid of some XubStrings
    
    Change-Id: Ie522330aa1470677ddcc8f9e6d76bbf4a63a9712

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index e8d3f48..4f67d05 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -590,13 +590,13 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
     if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled())
     {
         SvTreeListEntry* _pEntry = aWordsLB.FirstSelected();
-        XubString aNewWord(aWordED.GetText());
-        String sEntry(aNewWord);
-        XubString aReplaceStr(aReplaceED.GetText());
+        OUString aNewWord(aWordED.GetText());
+        OUString sEntry(aNewWord);
+        OUString aReplaceStr(aReplaceED.GetText());
 
         sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
         sal_uInt16 nPos = aAllDictsLB.GetSelectEntryPos();
-        if ( nPos != LISTBOX_ENTRY_NOTFOUND && aNewWord.Len() > 0)
+        if ( nPos != LISTBOX_ENTRY_NOTFOUND && !aNewWord.isEmpty())
         {
             DBG_ASSERT(nPos < aDics.getLength(), "invalid dictionary index");
             Reference< XDictionary >  xDic( aDics.getConstArray()[ nPos ], UNO_QUERY );
@@ -625,7 +625,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
         if (DIC_ERR_NONE != nAddRes)
             SvxDicError( this, nAddRes );
 
-        if(DIC_ERR_NONE == nAddRes && sEntry.Len())
+        if(DIC_ERR_NONE == nAddRes && !sEntry.isEmpty())
         {
             // insert new entry in list-box etc...
 
@@ -634,7 +634,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
 
             if(aReplaceFT.IsVisible())
             {
-                sEntry += '\t';
+                sEntry += "\t";
                 sEntry += aReplaceStr;
             }
 
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index d24da56..4f95ae0 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -250,7 +250,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         sal_Unicode cFldChr = 0;
 
 #if OSL_DEBUG_LEVEL > 0
-        XubString aDebugString;
+        OUString aDebugString;
 #endif
 
         // be careful: a field portion can be both: 0x01 (common field)
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 82c6cf8..d91bf7d 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1049,7 +1049,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
     rArgs.aConvText = rtl::OUString();
 
     // modify string according to redline information and hidden text
-    const XubString aOldTxt( m_Text );
+    const OUString aOldTxt( m_Text );
     const bool bRestoreString =
         lcl_MaskRedlinesAndHiddenText( *this, m_Text, 0, m_Text.Len() ) > 0;
 
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index b5eb64c..ccc8369 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -208,7 +208,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
 MenuButton* SwAnnotationWin::CreateMenuButton()
 {
     mpButtonPopup = new PopupMenu(SW_RES(MN_ANNOTATION_BUTTON));
-    XubString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
+    OUString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
     SwRewriter aRewriter;
     aRewriter.AddRule(UndoArg1,GetAuthor());
     aText = aRewriter.Apply(aText);
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 17ca3ca..36effb9 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -326,7 +326,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
             ((PopupMenu*)pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTxtControl, Select) );
 
             {
-                XubString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
+                OUString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
                 SwRewriter aRewriter;
                 aRewriter.AddRule(UndoArg1, mrSidebarWin.GetAuthor());
                 aText = aRewriter.Apply(aText);