editeng/source/editeng/editsel.cxx | 9 -- editeng/source/editeng/editsel.hxx | 2 linguistic/inc/linguistic/spelldta.hxx | 15 +--- linguistic/source/spelldta.cxx | 15 ---- sc/source/filter/ftools/ftools.cxx | 29 +++++---- svx/inc/svx/fmmodel.hxx | 1 svx/source/form/fmmodel.cxx | 19 ------ sw/source/filter/html/css1atr.cxx | 45 +++++++------- sw/source/filter/html/htmlatr.cxx | 6 - sw/source/filter/html/htmltabw.cxx | 15 ++-- unotools/inc/unotools/atom.hxx | 22 ------- unotools/source/misc/atom.cxx | 102 --------------------------------- unusedcode.easy | 4 - vcl/unx/generic/printer/ppdparser.cxx | 26 ++++++-- 14 files changed, 76 insertions(+), 234 deletions(-)
New commits: commit eff6245f9848bf32414ab2496c37bdc5ac774747 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Sep 28 09:20:05 2011 +0100 ByteString->rtl::OStringBuffer diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 23b6f92..cf48cdd 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "ftools.hxx" +#include <rtl/strbuf.hxx> #include <tools/color.hxx> #include <unotools/charclass.hxx> #include <svl/itempool.hxx> @@ -278,33 +279,35 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const Strin ByteString ScfTools::ReadCString( SvStream& rStrm ) { - ByteString aRet; - sal_Char cChar; + rtl::OStringBuffer aRet; - rStrm >> cChar; - while( cChar ) + while (1) { - aRet += cChar; + sal_Char cChar(0); rStrm >> cChar; + if (!cChar) + break; + aRet.append(cChar); } - return aRet; + + return aRet.makeStringAndClear(); } ByteString ScfTools::ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft ) { - ByteString aRet; - sal_Char cChar; + rtl::OStringBuffer aRet; - rStrm >> cChar; - rnBytesLeft--; - while( cChar ) + while (1) { - aRet += cChar; + sal_Char cChar(0); rStrm >> cChar; rnBytesLeft--; + if (!cChar) + break; + aRet.append(cChar); } - return aRet; + return aRet.makeStringAndClear(); } void ScfTools::AppendCString( SvStream& rStrm, ByteString& rString ) commit 0be6fb77a7b749d7bb726311f68d4113b4eccb88 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Sep 28 09:08:00 2011 +0100 callcatcher: another round diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx index a144955..5bccb22 100644 --- a/unotools/inc/unotools/atom.hxx +++ b/unotools/inc/unotools/atom.hxx @@ -83,10 +83,7 @@ namespace utl { int getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate = sal_False ); - void getRecent( int atomClass, int atom, ::std::list< AtomDescription >& atoms ); - const ::rtl::OUString& getString( int atomClass, int atom ) const; - void getClass( int atomClass, ::std::list< AtomDescription >& atoms ) const; void overrideAtom( int atomClass, int atom, const ::rtl::OUString& description ); void overrideAtom( int atomClass, const ::com::sun::star::util::AtomDescription& newDescription ) diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index df422ba..ade01ae 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -160,16 +160,6 @@ int MultiAtomProvider::getLastAtom( int atomClass ) const return it != m_aAtomLists.end() ? it->second->getLastAtom() : INVALID_ATOM; } -void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl::AtomDescription >& atoms ) -{ - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = - m_aAtomLists.find( atomClass ); - if( it != m_aAtomLists.end() ) - it->second->getRecent( atom, atoms ); - else - atoms.clear(); -} - const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = @@ -187,16 +177,6 @@ sal_Bool MultiAtomProvider::hasAtom( int atomClass, int atom ) const return it != m_aAtomLists.end() ? it->second->hasAtom( atom ) : sal_False; } -void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescription >& atoms) const -{ - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); - - if( it != m_aAtomLists.end() ) - it->second->getAll( atoms ); - else - atoms.clear(); -} - void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUString& description ) { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); diff --git a/unusedcode.easy b/unusedcode.easy index b7c0321..5cd6d17 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -139,7 +139,6 @@ EditEngine::SetText(unsigned short, EditTextObject const&) EditEngine::StopSelectionMode() EditEngine::WordLeft(ESelection const&, unsigned short) const EditEngine::WordRight(ESelection const&, unsigned short) const -EditSelectionEngine::GetCurView() EditView::Drop(DropEvent const&) EditView::GetDropPos() EditView::GetSelectionMode() const @@ -169,7 +168,6 @@ FmEntryDataArray::Insert(FmEntryData* const*, unsigned short) FmEntryDataArray::Insert(FmEntryDataArray const*, unsigned short, unsigned short) FmEntryDataArray::Remove(FmEntryData* const&, unsigned short) FmFieldWinMgr::GetChildWindowId() -FmFormModel::FmFormModel(SfxItemPool*, SfxObjectShell*, bool) FmFormObj::getType() const FmPropBrwMgr::GetChildWindowId() FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&) @@ -2903,7 +2901,6 @@ unicode::isTitle(unsigned short) unicode::isUnicodeScriptType(unsigned short, short) unographic::GraphicDescriptor::isValid() const utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&) -utl::AtomServer::AtomServer() utl::Bootstrap::checkBootstrapStatus(rtl::OUString&) utl::Bootstrap::getAllUsersValue(rtl::OUString const&) utl::ConfigManager::ConfigManager(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>) commit 820a569b8d119ae5a62ceb3f4fab027792902f35 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Sep 28 00:30:41 2011 +0100 ByteString->rtl::OStringBuffer diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 2e58fbb..574f51d 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -910,9 +910,11 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, case RES_POOLCOLL_TABLE: if( pPseudo ) { - rToken.Assign( OOO_STRING_SVTOOLS_HTML_tabledata ); - rToken.Append( ' ' ); - rToken.Append( OOO_STRING_SVTOOLS_HTML_parabreak ); + rToken = rtl::OStringBuffer( + RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_tabledata)) + .append(' ') + .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_parabreak)) + .makeStringAndClear(); } else rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); @@ -920,9 +922,11 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, case RES_POOLCOLL_TABLE_HDLN: if( pPseudo ) { - rToken.Assign( OOO_STRING_SVTOOLS_HTML_tableheader ); - rToken.Append( ' ' ); - rToken.Append( OOO_STRING_SVTOOLS_HTML_parabreak ); + rToken = rtl::OStringBuffer( + RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_tableheader)) + .append(' ') + .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_parabreak)) + .makeStringAndClear(); } else rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); @@ -2522,36 +2526,33 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt, } } - ByteString sOut; + rtl::OStringBuffer sOut; if( pUStr ) - sOut.Append( pUStr ); + sOut.append(pUStr); if( pOStr ) { - if( sOut.Len() ) - sOut += ' '; - - sOut.Append( pOStr ); + if (sOut.getLength()) + sOut.append(' '); + sOut.append(pOStr); } if( pCOStr ) { - if( sOut.Len() ) - sOut += ' '; - - sOut.Append( pCOStr ); + if (sOut.getLength()) + sOut.append(' '); + sOut.append(pCOStr); } if( pBStr ) { - if( sOut.Len() ) - sOut += ' '; - - sOut.Append( pBStr ); + if (sOut.getLength()) + sOut.append(' '); + sOut.append(pBStr); } - if( sOut.Len() ) - rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_decoration, sOut ); + if (sOut.getLength()) + rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_decoration, sOut.makeStringAndClear() ); else if( bNone ) rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_decoration, sCSS1_PV_none ); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 01dcebf..f8d8c8c 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2722,10 +2722,10 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) else pStr = OOO_STRING_SVTOOLS_HTML_AL_right; - ByteString sOut( OOO_STRING_SVTOOLS_HTML_linebreak ); - (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += pStr; + rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_linebreak)); + sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).append('=').append(pStr); + HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), sOut.getStr() ); - HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), sOut.GetBuffer() ); rHTMLWrt.bClearLeft = sal_False; rHTMLWrt.bClearRight = sal_False; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index ecb6aee..1c3a9fb 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -831,10 +831,10 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( pCaption && pCaption->Len() ) { rWrt.OutNewLine(); // <CAPTION> in neue Zeile - ByteString sOutStr( OOO_STRING_SVTOOLS_HTML_caption ); - (((sOutStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') - += (bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.GetBuffer(), sal_True ); + rtl::OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption)); + sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=') + .append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), sal_True ); HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, sal_False ); } @@ -1197,9 +1197,10 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True ); else { - ByteString sOut( OOO_STRING_SVTOOLS_HTML_division ); - (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += OOO_STRING_SVTOOLS_HTML_AL_right; - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer(), + rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division)); + sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=') + .append(OOO_STRING_SVTOOLS_HTML_AL_right); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(), sal_True ); } rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken commit 5eb475f3085a107bc817b3490e8d7ef8eec0c4d8 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Sep 27 23:11:59 2011 +0100 ByteString->rtl::OStringBuffer diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 74a3358..8b99f1a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -923,6 +923,20 @@ String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGloba return OStringToOUString( aTrans.makeStringAndClear(), bIsGlobalized ? RTL_TEXTENCODING_UTF8 : m_aFileEncoding ); } +namespace +{ + bool oddDoubleQuoteCount(rtl::OStringBuffer &rBuffer) + { + bool bHasOddCount = false; + for (sal_Int32 i = 0; i < rBuffer.getLength(); ++i) + { + if (rBuffer[i] == '"') + bHasOddCount = !bHasOddCount; + } + return bHasOddCount; + } +} + void PPDParser::parse( ::std::list< rtl::OString >& rLines ) { std::list< rtl::OString >::iterator line = rLines.begin(); @@ -1020,16 +1034,16 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) aLine = aCurrentLine.Copy( nPos+1 ); if( aLine.Len() ) { - while( ! ( aLine.GetTokenCount( '"' ) & 1 ) && - line != rLines.end() ) - // while there is an even number of tokens; that means - // an odd number of doubleqoutes + //while( ! ( aLine.GetTokenCount( '"' ) & 1 ) && + rtl::OStringBuffer aBuffer(aLine); + while (line != rLines.end() && oddDoubleQuoteCount(aBuffer)) { // copy the newlines also - aLine += '\n'; - aLine += ByteString(*line); + aBuffer.append('\n'); + aBuffer.append(*line); ++line; } + aLine = aBuffer.makeStringAndClear(); } aLine = WhitespaceToSpace( aLine ); commit 84841b118ad93d5ef0cbbf293067a020c3382ff5 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Sep 27 22:33:27 2011 +0100 callcatcher: AtomServer unused diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx index 714355f..a144955 100644 --- a/unotools/inc/unotools/atom.hxx +++ b/unotools/inc/unotools/atom.hxx @@ -93,25 +93,6 @@ namespace utl { { overrideAtom( atomClass, newDescription.atom, newDescription.description ); } sal_Bool hasAtom( int atomClass, int atom ) const; }; - - class AtomServer : public ::cppu::WeakAggImplHelper1< ::com::sun::star::util::XAtomServer > - { - private: - MultiAtomProvider m_aProvider; - ::osl::Mutex m_aMutex; - public: - AtomServer(); - virtual ~AtomServer(); - - const ::rtl::OUString& getString( int atomClass, int atom ) const - { return m_aProvider.getString( atomClass, atom ); } - - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::AtomDescription > SAL_CALL getClass( sal_Int32 atomClass ) throw(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::util::AtomDescription > > SAL_CALL getClasses( const ::com::sun::star::uno::Sequence< sal_Int32 >& atomClasses ) throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAtomDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AtomClassRequest >& atoms ) throw(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::AtomDescription > SAL_CALL getRecentAtoms( sal_Int32 atomClass, sal_Int32 atom ) throw(); - virtual sal_Int32 SAL_CALL getAtom( sal_Int32 atomClass, const ::rtl::OUString& description, sal_Bool create ) throw(); - }; } #endif diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index b54c7da..df422ba 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -205,86 +205,4 @@ void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUSt m_aAtomLists[ atomClass ]->overrideAtom( atom, description ); } -// ----------------------------------------------------------------------- - -AtomServer::AtomServer() -{ -} - -AtomServer::~AtomServer() -{ -} - -sal_Int32 AtomServer::getAtom( sal_Int32 atomClass, const ::rtl::OUString& description, sal_Bool create ) throw() -{ - ::osl::Guard< ::osl::Mutex > guard( m_aMutex ); - - return m_aProvider.getAtom( atomClass, description, create ); -} - -Sequence< Sequence< NMSP_UTIL::AtomDescription > > AtomServer::getClasses( const Sequence< sal_Int32 >& atomClasses ) throw() -{ - ::osl::Guard< ::osl::Mutex > guard( m_aMutex ); - - Sequence< Sequence< NMSP_UTIL::AtomDescription > > aRet( atomClasses.getLength() ); - for( int i = 0; i < atomClasses.getLength(); i++ ) - { - aRet.getArray()[i] = getClass( atomClasses.getConstArray()[i] ); - } - return aRet; -} - -Sequence< NMSP_UTIL::AtomDescription > AtomServer::getClass( sal_Int32 atomClass ) throw() -{ - ::osl::Guard< ::osl::Mutex > guard( m_aMutex ); - - ::std::list< ::utl::AtomDescription > atoms; - m_aProvider.getClass( atomClass, atoms ); - - Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() ); - for( int i = aRet.getLength()-1; i >= 0; i-- ) - { - aRet.getArray()[i].atom = atoms.back().atom; - aRet.getArray()[i].description = atoms.back().description; - atoms.pop_back(); - } - - return aRet; -} - -Sequence< NMSP_UTIL::AtomDescription > AtomServer::getRecentAtoms( sal_Int32 atomClass, sal_Int32 atom ) throw() -{ - ::osl::Guard< ::osl::Mutex > guard( m_aMutex ); - - ::std::list< ::utl::AtomDescription > atoms; - m_aProvider.getRecent( atomClass, atom, atoms ); - - Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() ); - for( int i = aRet.getLength()-1; i >= 0; i-- ) - { - aRet.getArray()[i].atom = atoms.back().atom; - aRet.getArray()[i].description = atoms.back().description; - atoms.pop_back(); - } - - return aRet; -} - -Sequence< ::rtl::OUString > AtomServer::getAtomDescriptions( const Sequence< AtomClassRequest >& atoms ) throw() -{ - ::osl::Guard< ::osl::Mutex > guard( m_aMutex ); - - int nStrings = 0, i; - for( i = 0; i < atoms.getLength(); i++ ) - nStrings += atoms.getConstArray()[ i ].atoms.getLength(); - Sequence< ::rtl::OUString > aRet( nStrings ); - for( i = 0, nStrings = 0; i < atoms.getLength(); i++ ) - { - const AtomClassRequest& rRequest = atoms.getConstArray()[i]; - for( int n = 0; n < rRequest.atoms.getLength(); n++ ) - aRet.getArray()[ nStrings++ ] = m_aProvider.getString( rRequest.atomClass, rRequest.atoms.getConstArray()[ n ] ); - } - return aRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 19bf1de0d4d1800b51485b4d33dc27a78854d521 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Sep 27 22:20:51 2011 +0100 callcatcher: unused code diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx index e7f0fc8..c0752fc 100644 --- a/editeng/source/editeng/editsel.cxx +++ b/editeng/source/editeng/editsel.cxx @@ -109,13 +109,4 @@ void EditSelectionEngine::SetCurView( EditView* pNewView ) SetWindow( (Window*)0 ); } -EditView* EditSelectionEngine::GetCurView() -{ - EditView* pView = 0; - if ( GetFunctionSet() ) - pView = ((EditSelFunctionSet*)GetFunctionSet())->GetCurView(); - - return pView; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx index 12e9131..2c3bdc9 100644 --- a/editeng/source/editeng/editsel.hxx +++ b/editeng/source/editeng/editsel.hxx @@ -53,7 +53,6 @@ public: virtual void DeselectAll(); void SetCurView( EditView* pView ) { pCurView = pView; } - EditView* GetCurView() { return pCurView; } }; class EditSelectionEngine : public SelectionEngine @@ -64,7 +63,6 @@ public: EditSelectionEngine(); void SetCurView( EditView* pNewView ); - EditView* GetCurView(); }; #endif // _EDITSEL_HXX diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index 8f9ee82..12e7d3e 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -61,7 +61,6 @@ public: FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 217e61f..6c2a872 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -104,25 +104,6 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh |* Ctor |* \************************************************************************/ -FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, - bool bUseExtColorTable - ) - :SdrModel(pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) - ,m_pImpl(NULL) - ,m_pObjShell(0) - ,m_bOpenInDesignMode(sal_False) - ,m_bAutoControlFocus(sal_False) -{ - m_pImpl = new FmFormModelImplData; - m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); - m_pImpl->pUndoEnv->acquire(); -} - -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable) :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) commit 865ef9c4488ed02941526e5f6d1e17a76c73bbbe Author: Caolán McNamara <caol...@redhat.com> Date: Tue Sep 27 21:58:56 2011 +0100 unused ctor, and use boost::noncopyable diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index afc8fab..827dad1 100644 --- a/linguistic/inc/linguistic/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -35,10 +35,12 @@ #include <tools/solar.h> -#include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type +#include <uno/lbnames.h> #include <cppuhelper/implbase2.hxx> #include <linguistic/lngdllapi.h> +#include <boost/noncopyable.hpp> + namespace com { namespace sun { namespace star { namespace linguistic2 { class XDictionaryList; @@ -75,27 +77,22 @@ void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage, /////////////////////////////////////////////////////////////////////////// -class SpellAlternatives : - public cppu::WeakImplHelper2 +class SpellAlternatives + : public cppu::WeakImplHelper2 < ::com::sun::star::linguistic2::XSpellAlternatives, ::com::sun::star::linguistic2::XSetSpellAlternatives > + , private ::boost::noncopyable { ::com::sun::star::uno::Sequence< ::rtl::OUString > aAlt; // list of alternatives, may be empty. ::rtl::OUString aWord; sal_Int16 nType; // type of failure sal_Int16 nLanguage; - // disallow copy-constructor and assignment-operator for now - SpellAlternatives(const SpellAlternatives &); - SpellAlternatives & operator = (const SpellAlternatives &); - public: SpellAlternatives(); SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, - const ::rtl::OUString &rRplcWord ); - SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives ); virtual ~SpellAlternatives(); diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index c197fea..90d1d60 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -199,21 +199,6 @@ SpellAlternatives::SpellAlternatives() SpellAlternatives::SpellAlternatives( - const OUString &rWord, sal_Int16 nLang, - sal_Int16 nFailureType, const OUString &rRplcWord ) : - aAlt ( Sequence< OUString >(1) ), - aWord (rWord), - nType (nFailureType), - nLanguage (nLang) -{ - if (rRplcWord.getLength()) - aAlt.getArray()[ 0 ] = rRplcWord; - else - aAlt.realloc( 0 ); -} - - -SpellAlternatives::SpellAlternatives( const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, const Sequence< OUString > &rAlternatives ) : aAlt (rAlternatives), diff --git a/unusedcode.easy b/unusedcode.easy index 51939c1..b7c0321 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2499,7 +2499,6 @@ libwpg::WPGDashArray::at(unsigned int) const libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat) libwpg::WPGraphics::parse(unsigned char const*, unsigned long, libwpg::WPGPaintInterface*, libwpg::WPGFileFormat) linguistic::IsLower(String const&, unsigned short, unsigned short, short) -linguistic::SpellAlternatives::SpellAlternatives(rtl::OUString const&, short, short, rtl::OUString const&) linguistic::ToLower(unsigned short, short) linguistic::ToTitle(String const&, short) linguistic::ToUpper(String const&, short)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits