basic/source/uno/scriptcont.cxx | 5 +++-- cui/source/dialogs/SpellDialog.cxx | 8 +++++++- dbaccess/source/ui/app/AppController.cxx | 4 ++-- dbaccess/source/ui/inc/TableCopyHelper.hxx | 2 +- editeng/source/editeng/impedit2.cxx | 14 +++++++------- editeng/source/editeng/impedit4.cxx | 4 ++-- editeng/source/items/bulitem.cxx | 8 ++++---- include/svtools/ctrlbox.hxx | 3 +-- include/svtools/ehdl.hxx | 1 - include/svtools/helpopt.hxx | 2 +- include/svtools/imap.hxx | 1 - include/svtools/imapobj.hxx | 1 - include/svtools/inetimg.hxx | 1 - include/svtools/inettbc.hxx | 1 - include/svtools/ivctrl.hxx | 1 - include/svtools/openfiledroptargetlistener.hxx | 1 - include/svtools/parhtml.hxx | 1 - include/svtools/svparser.hxx | 2 +- include/svtools/transfer.hxx | 1 - include/svx/nbdtmg.hxx | 2 -- include/svx/xmlexchg.hxx | 1 + include/unotools/charclass.hxx | 1 - include/unotools/localfilehelper.hxx | 1 - include/unotools/pathoptions.hxx | 1 - include/unotools/tempfile.hxx | 1 - include/unotools/ucbstreamhelper.hxx | 1 - sc/source/filter/inc/stylesbuffer.hxx | 1 - sc/source/filter/oox/stylesbuffer.cxx | 6 ------ svtools/source/config/htmlcfg.cxx | 1 + svtools/source/svhtml/parhtml.cxx | 1 + svtools/source/urlobj/inetimg.cxx | 1 + svx/source/sidebar/nbdtmg.cxx | 11 ----------- sw/inc/calc.hxx | 1 + unusedcode.easy | 3 --- 34 files changed, 34 insertions(+), 60 deletions(-)
New commits: commit f42768fe0b60ecbbe9c68d775329bf28c0690131 Author: Caolán McNamara <[email protected]> Date: Mon Sep 2 11:00:05 2013 +0100 Resolves: fdo#68794 blank placeholders when there is no known language yet Change-Id: I7f43144bd61ddc575d8b7094567433fdfd5ee291 diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 76bd8c2..dfaef31 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -189,9 +189,15 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, , rParent(*pChildWindow) { m_sTitleSpellingGrammar = GetText(); + m_sTitleSpelling = get<FixedText>("alttitleft")->GetText(); + + // fdo#68794 set initial title for cases where no text has been processed + // yet to show its language attributes + OUString sTitle = rParent.HasGrammarChecking() ? m_sTitleSpellingGrammar : m_sTitleSpelling; + SetText(sTitle.replaceFirst("$LANGUAGE ($LOCATION)", "")); + m_sResumeST = get<FixedText>("resumeft")->GetText(); m_sNoSuggestionsST = get<FixedText>("nosuggestionsft")->GetText(); - m_sTitleSpelling = get<FixedText>("alttitleft")->GetText(); get(m_pLanguageFT, "languageft"); get(m_pLanguageLB, "languagelb"); commit ed0f0fa730186a99e3e315ef55f63410af8146b2 Author: Caolán McNamara <[email protected]> Date: Mon Sep 2 09:03:31 2013 +0100 XubString->OUString Change-Id: I5424a148c7173409e6e56f9483fcc769696707bc diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 635ccca..7e1bc64 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -38,6 +38,7 @@ #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <osl/mutex.hxx> +#include <osl/thread.h> #include <rtl/digest.h> #include <rtl/strbuf.hxx> @@ -958,7 +959,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary SbModule* pMod = pBasicLib->FindModule( aElementName ); if( !pMod ) { - pMod = pBasicLib->MakeModule( aElementName, String() ); + pMod = pBasicLib->MakeModule( aElementName, OUString() ); pBasicLib->SetModified( sal_False ); } @@ -1077,7 +1078,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary SbModule* pMod = pBasicLib->FindModule( aElementName ); if( !pMod ) { - pMod = pBasicLib->MakeModule( aElementName, String() ); + pMod = pBasicLib->MakeModule( aElementName, OUString() ); pBasicLib->SetModified( sal_False ); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 8ab54d2..b97a02e 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2520,7 +2520,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) OUString sName = xContent->getIdentifier()->getContentIdentifier(); sal_Int32 nIndex = 0; sName = sName.copy(sName.getToken(0,'/',nIndex).getLength() + 1); - if ( m_aAsyncDrop.aUrl.Len() >= sName.getLength() && 0 == sName.compareTo(m_aAsyncDrop.aUrl,sName.getLength()) ) + if ( m_aAsyncDrop.aUrl.getLength() >= sName.getLength() && m_aAsyncDrop.aUrl.startsWith(sName) ) { m_aAsyncDrop.aDroppedData.clear(); return DND_ACTION_NONE; @@ -2530,7 +2530,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) Reference< XHierarchicalNameAccess > xContainer(getElements(m_aAsyncDrop.nType),UNO_QUERY); Reference<XNameAccess> xNameAccess(xContainer,UNO_QUERY); - if ( m_aAsyncDrop.aUrl.Len() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) + if ( !m_aAsyncDrop.aUrl.isEmpty() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) xNameAccess.set(xContainer->getByHierarchicalName(m_aAsyncDrop.aUrl),UNO_QUERY); if ( xNameAccess.is() ) diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index f2b1dc5..31ca3de 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -74,7 +74,7 @@ namespace dbaui //for transfor the tablename OUString sDefaultTableName; - String aUrl; + OUString aUrl; SotStorageStreamRef aHtmlRtfStorage; ElementType nType; SvTreeListEntry* pDroppedAt; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f5806b3..045835a 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2036,7 +2036,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, Edit { if ( IsUndoEnabled() && !IsInUndo() ) { - XubString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); + OUString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); // Check whether attributes are deleted or changed: sal_uInt16 nStart = rPaM.GetIndex(); @@ -2895,15 +2895,15 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel ) { sal_Int32 nPara = aEditDoc.GetPos( aPaM.GetNode() ); OSL_ENSURE( nPara > 0, "AutoIndenting: Error!" ); - XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); - sal_uInt16 n = 0; - while ( ( n < aPrevParaText.Len() ) && - ( ( aPrevParaText.GetChar(n) == ' ' ) || ( aPrevParaText.GetChar(n) == '\t' ) ) ) + OUString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); + sal_Int32 n = 0; + while ( ( n < aPrevParaText.getLength() ) && + ( ( aPrevParaText[n] == ' ' ) || ( aPrevParaText[n] == '\t' ) ) ) { - if ( aPrevParaText.GetChar(n) == '\t' ) + if ( aPrevParaText[n] == '\t' ) aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) ); else - aPaM = ImpInsertText( aPaM, OUString(aPrevParaText.GetChar(n)) ); + aPaM = ImpInsertText( aPaM, OUString(aPrevParaText[n]) ); n++; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1b094f3..e746a14 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -263,7 +263,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel ) if ( nNode == nEndNode ) // can also be == nStart! nEndPos = aSel.Max().GetIndex(); } - XubString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); + OUString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); rOutput.WriteByteStringLine( aTmpStr, rOutput.GetStreamCharSet() ); } @@ -661,7 +661,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( n == nEndPortion ) nE = nEndPos; - XubString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); + OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc ); rOutput << '}'; } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 074df55..8264c0b 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -370,10 +370,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c OUString SvxBulletItem::GetFullText() const { - XubString aStr( aPrevText ); - aStr += cSymbol; - aStr += aFollowText; - return aStr; + OUStringBuffer aStr(aPrevText); + aStr.append(cSymbol); + aStr.append(aFollowText); + return aStr.makeStringAndClear(); } //------------------------------------------------------------------------ diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index d786482..b3a88df 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -22,7 +22,6 @@ #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <vcl/image.hxx> @@ -119,7 +118,7 @@ potentially not all applications [Draw,Equation,FontWork] can properly handle synthetic fonts. On filling, the previous name will be retained if possible. -For DontKnow, the FontStyleBox should be filled with String(), +For DontKnow, the FontStyleBox should be filled with OUString(), so it will contain a list with the default attributes. The currently shown style probably needs to be reset by the application. diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 33afac3..ab54d55 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -25,7 +25,6 @@ #include "svtools/svtdllapi.h" #include <tools/errinf.hxx> -#include <tools/string.hxx> class Window; class ResMgr; diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 35ed06d..0d8d96b 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -22,7 +22,7 @@ #include "svtools/svtdllapi.h" #include <list> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/options.hxx> class SvtHelpOptions_Impl; diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index 60dafcb..f5fba84 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -21,7 +21,6 @@ #define _IMAP_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <tools/stream.hxx> #include <vector> diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 7f383de..f77aec7 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -21,7 +21,6 @@ #define _GOODIES_IMAPOBJ_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <svl/macitem.hxx> #include <rtl/strbuf.hxx> diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index e5a80b5..71d8daa 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -19,7 +19,6 @@ #ifndef _INETIMG_HXX #define _INETIMG_HXX -#include <tools/string.hxx> #include <tools/gen.hxx> class SvData; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 1041436..3c8fe00 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -22,7 +22,6 @@ #include "rtl/ref.hxx" #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <vcl/combobox.hxx> diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 0a8e059..d8aecb4 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -21,7 +21,6 @@ #define _ICNVW_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <vcl/ctrl.hxx> #include <tools/link.hxx> #include <tools/contnr.hxx> diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 1bebf7d..32d87b4 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase1.hxx> #include <sot/exchange.hxx> -#include <tools/string.hxx> /** DropTargetListener that takes care of opening a file when it is dropped in the frame. */ diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index f57b1ce..19eca16 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -22,7 +22,6 @@ #include "svtools/svtdllapi.h" #include <tools/solar.h> -#include <tools/string.hxx> #include <svtools/svparser.hxx> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index ee4688e..7d159af 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -22,9 +22,9 @@ #include "svtools/svtdllapi.h" #include <tools/link.hxx> -#include <tools/string.hxx> #include <tools/ref.hxx> #include <rtl/textenc.h> +#include <rtl/ustring.hxx> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/utility.hpp> #include <vector> diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index f857326..6354a0a 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -23,7 +23,6 @@ #include "svtools/svtdllapi.h" #include <tools/globname.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <sot/formats.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 8019779..3632bb1 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -21,6 +21,7 @@ #define _SVX_XMLEXCHG_HXX_ #include <svtools/transfer.hxx> +#include <tools/string.hxx> #include "svx/svxdllapi.h" namespace com { diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index 0522df3..230a5b2 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -24,7 +24,6 @@ #include <boost/noncopyable.hpp> #include <i18nlangtag/languagetag.hxx> -#include <tools/string.hxx> #include <tools/solar.h> #include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/i18n/KParseTokens.hpp> diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index 4a1864b..77ead6b 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -23,7 +23,6 @@ #include "unotools/unotoolsdllapi.h" #include <rtl/ustring.hxx> -#include <tools/string.hxx> namespace utl { diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index 426524d..d1d6bd9 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -20,7 +20,6 @@ #define INCLUDED_unotools_PATHOPTIONS_HXX #include "unotools/unotoolsdllapi.h" -#include <tools/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/options.hxx> diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index da3a472..9efe45a 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -21,7 +21,6 @@ #ifndef _UNOTOOLS_TEMPFILE_HXX #define _UNOTOOLS_TEMPFILE_HXX -#include <tools/string.hxx> #include <tools/stream.hxx> namespace utl diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index 44552d6..4a48a21 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -45,7 +45,6 @@ namespace com } } -class String; namespace utl { class UcbLockBytesHandler; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index f3f2e7d..5fff134 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -18,6 +18,7 @@ */ +#include <osl/thread.h> #include <svtools/htmlcfg.hxx> #include <svtools/parhtml.hxx> #include <unotools/syslocale.hxx> diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 3bc5a5c..a6717d5 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -22,6 +22,7 @@ #include <stdio.h> #include <comphelper/string.hxx> #include <tools/stream.hxx> +#include <tools/string.hxx> #include <tools/debug.hxx> #include <tools/color.hxx> #include <rtl/ustrbuf.hxx> diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index b7a9862..98999c4 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/thread.h> #include <sot/formats.hxx> #include <tools/stream.hxx> diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 1411f43..4b98c2d 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -22,6 +22,7 @@ #include <vector> +#include <tools/string.hxx> #include <unotools/syslocale.hxx> #include <basic/sbxvar.hxx> commit 3b6d6d1741fae5940987358c30176858717b4f72 Author: Caolán McNamara <[email protected]> Date: Mon Sep 2 08:56:57 2013 +0100 callcatcher: updated unused code Change-Id: I78a287b3e4767fde1d0df7f54362f4587a21ed27 diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index ef5095b..d14bc87 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -245,7 +245,6 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase static BulletsTypeMgr* _instance; public: BulletsTypeMgr(const NBOType aType); - BulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg); BulletsTypeMgr(const BulletsTypeMgr& aTypeMgr); virtual ~BulletsTypeMgr() {} virtual void Init(); @@ -278,7 +277,6 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase static GraphyicBulletsTypeMgr* _instance; public: GraphyicBulletsTypeMgr(const NBOType aType); - GraphyicBulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg); GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTypeMgr); virtual ~GraphyicBulletsTypeMgr(); virtual void Init(); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 0f5ce54..953f7fa 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -981,7 +981,6 @@ public: /** Writes the fill attributes of the specified fill data to the passed property map. */ void writeFillToItemSet( SfxItemSet& rItemSet, sal_Int32 nFillId, bool bSkipPoolDefs = false ) const; void writeFillToPropertyMap( PropertyMap& rPropMap, sal_Int32 nFillId ) const; - void writeCellXfToMarkData( ::ScMarkData& rMark, sal_Int32 nXfId, sal_Int32 nNumFmtId ); /** Writes the cell formatting attributes of the specified XF to the passed property set. */ void writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const; diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index d3f52dc..5024d06 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -3321,12 +3321,6 @@ void StylesBuffer::writeFillToPropertyMap( PropertyMap& rPropMap, sal_Int32 nFil pFill->writeToPropertyMap( rPropMap ); } -void StylesBuffer::writeCellXfToMarkData( ScMarkData& rMark, sal_Int32 nXfId, sal_Int32 nNumFmtId ) -{ - if( Xf* pXf = maCellXfs.get( nXfId ).get() ) - pXf->writeToMarkData( rMark, nNumFmtId ); -} - bool operator==( const XfModel& rXfModel1, const XfModel& rXfModel2 ) { return ( rXfModel1.mbCellXf == rXfModel2.mbCellXf && diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 5eacb4d..1bee8da 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -281,12 +281,6 @@ BulletsTypeMgr::BulletsTypeMgr(const NBOType aType): Init(); } -BulletsTypeMgr::BulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg): - NBOTypeMgrBase(aType,pArg) -{ - Init(); -} - BulletsTypeMgr::BulletsTypeMgr(const BulletsTypeMgr& aTypeMgr): NBOTypeMgrBase(aTypeMgr) { @@ -561,11 +555,6 @@ GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(const NBOType aType): Init(); } -GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg): - NBOTypeMgrBase(aType,pArg) -{ - Init(); -} GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTypeMgr): NBOTypeMgrBase(aTypeMgr) { diff --git a/unusedcode.easy b/unusedcode.easy index 6a585922..2d4a852 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -192,11 +192,8 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::F svx::DialControl::GetLinkedField() const svx::DialControl::GetModifyHdl() const svx::sidebar::AreaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*) -svx::sidebar::BulletsTypeMgr::BulletsTypeMgr(unsigned short, SfxItemSet const*) -svx::sidebar::GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(unsigned short, SfxItemSet const*) svx::sidebar::LinePropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*) svx::sidebar::LineWidthControl::GetValueSet() -svx::sidebar::NumberingTypeMgr::GetNumCount() const svx::sidebar::ParaPropertyPanel::InitImageList(boost::scoped_ptr<ToolBox>&, ImageList&, ImageList&) svx::sidebar::ParaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*) sw::util::HdFtDistanceGlue::EqualTopBottom(sw::util::HdFtDistanceGlue const&) const
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
