basic/source/classes/codecompletecache.cxx | 15 -------- editeng/source/editeng/editobj.cxx | 10 ----- editeng/source/editeng/editobj2.hxx | 1 i18nlangtag/source/languagetag/languagetag.cxx | 28 ---------------- i18npool/source/localedata/LocaleNode.hxx | 3 - i18npool/source/localedata/filewriter.cxx | 19 ----------- include/basic/codecompletecache.hxx | 4 -- include/i18nlangtag/languagetag.hxx | 16 --------- include/sfx2/recentdocsview.hxx | 1 include/svtools/ctrlbox.hxx | 1 include/svx/sidebar/PanelLayout.hxx | 2 - include/tools/bigint.hxx | 1 include/tools/rc.hxx | 2 + include/vcl/menu.hxx | 7 +--- sc/source/filter/excel/impop.cxx | 6 --- sc/source/filter/inc/imp_op.hxx | 1 sfx2/source/control/recentdocsview.cxx | 6 --- svtools/source/control/ctrlbox.cxx | 19 ----------- svx/source/sidebar/PanelLayout.cxx | 17 --------- tools/source/generic/bigint.cxx | 43 ------------------------- tools/source/rc/resmgr.cxx | 2 + unusedcode.easy | 21 ------------ vcl/inc/outfont.hxx | 2 + vcl/inc/regband.hxx | 5 -- vcl/inc/unx/saldisp.hxx | 2 - vcl/source/gdi/outdev3.cxx | 2 - vcl/source/gdi/regband.cxx | 32 ------------------ vcl/source/window/menu.cxx | 13 ++----- vcl/unx/generic/app/saldisp.cxx | 2 - 29 files changed, 16 insertions(+), 267 deletions(-)
New commits: commit 2dcc6a491a308b65172b509e895942d8b1b9c536 Author: Noel Grandin <n...@peralex.com> Date: Fri Feb 28 08:31:06 2014 +0200 remove unused code BigInt::GetString() Change-Id: I0e1b1e07103b7aafd0b6691e0fcf0d2c8f612ac8 diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index 3b8a982..6d52b60 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -80,7 +80,6 @@ public: operator sal_uIntPtr() const; void Set( bool bSet ) { bIsSet = bSet ? sal_True : sal_False; } - OUString GetString() const; bool IsSet() const { return (bool)bIsSet; } bool IsNeg() const; diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index 6576cfb..61e404c 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -607,49 +607,6 @@ BigInt::operator double() const } } -OUString BigInt::GetString() const -{ - - if ( !bIsBig ) - { - return OUString::number( nVal ); - } - else - { - BigInt aTmp( *this ); - BigInt a1000000000( 1000000000L ); - aTmp.Abs(); - OUStringBuffer sBuff(30); - do - { - BigInt a = aTmp; - a %= a1000000000; - aTmp /= a1000000000; - if ( a.nVal < 100000000L ) - { - // to get leading 0s - OUString aStr(OUString::number( a.nVal + 1000000000L )); - sBuff.insert(0, aStr.getStr() + 1); - } - else - { - sBuff.insert(0, OUString::number( a.nVal )); - } - } - while( aTmp.bIsBig ); - - if ( bIsNeg ) - { - sBuff.insert(0, OUString::number( -aTmp.nVal )); - } - else - { - sBuff.insert(0, OUString::number( aTmp.nVal )); - } - return sBuff.makeStringAndClear(); - } -} - BigInt& BigInt::operator=( const BigInt& rBigInt ) { if ( rBigInt.bIsBig ) diff --git a/unusedcode.easy b/unusedcode.easy index b25c716..86cb448 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,5 @@ AddressWalker::pop() BigInt::BigInt(unsigned int) -BigInt::GetString() const CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) Chart2ExportTest::testFdo74115WallGradientFill() ComboBox::GetMRUCount() const commit f6d97d00cd0c8d710bce614f7e557db2bc6d2f77 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 16:30:49 2014 +0200 remove unused code in basic/CodeCompleteDataCache Specifically: CodeCompleteDataCache::GetVars() const CodeCompleteDataCache::SetVars(boost::unordered_map const&) CodeCompleteDataCache::print() const Change-Id: I59fb6f50ff47747c3cac959302bf6b7c4f4d79d3 diff --git a/basic/source/classes/codecompletecache.cxx b/basic/source/classes/codecompletecache.cxx index aad0e4f..4c97310 100644 --- a/basic/source/classes/codecompletecache.cxx +++ b/basic/source/classes/codecompletecache.cxx @@ -118,21 +118,6 @@ std::ostream& operator<< (std::ostream& aStream, const CodeCompleteDataCache& aC return aStream; } -const CodeCompleteVarScopes& CodeCompleteDataCache::GetVars() const -{ - return aVarScopes; -} - -void CodeCompleteDataCache::SetVars( const CodeCompleteVarScopes& aScopes ) -{ - aVarScopes = aScopes; -} - -void CodeCompleteDataCache::print() const -{ - std::cerr << *this << std::endl; -} - void CodeCompleteDataCache::Clear() { aVarScopes.clear(); diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index f33914a..3721b96 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -87,14 +87,10 @@ public: friend BASIC_DLLPUBLIC std::ostream& operator<< (std::ostream& aStream, const CodeCompleteDataCache& aCache); - void SetVars( const CodeCompleteVarScopes& aScopes ); - const CodeCompleteVarScopes& GetVars() const; - void InsertGlobalVar( const OUString& sVarName, const OUString& sVarType ); void InsertLocalVar( const OUString& sProcName, const OUString& sVarName, const OUString& sVarType ); OUString GetVarType( const OUString& sVarName ) const; OUString GetCorrectCaseVarName( const OUString& sVarName, const OUString& sActProcName ) const; - void print() const; // wrapper for operator<<, prints to std::cerr void Clear(); }; diff --git a/unusedcode.easy b/unusedcode.easy index 934e94f..b25c716 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -3,9 +3,6 @@ BigInt::BigInt(unsigned int) BigInt::GetString() const CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) Chart2ExportTest::testFdo74115WallGradientFill() -CodeCompleteDataCache::GetVars() const -CodeCompleteDataCache::SetVars(boost::unordered::unordered_map<rtl::OUString, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > > > > > const&) -CodeCompleteDataCache::print() const ComboBox::GetMRUCount() const ConfigurationAccess::getPath(rtl::OUString const&) DocxSdrExport::getFlyFrameGraphic() commit 1069d025869d28077e0194ab90933b180b6d3b88 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 16:12:32 2014 +0200 remove unused code EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&) Change-Id: I7a021c6e33161b09707d3bbdfbf4b3eb2d941f45 diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 5ee30f1..b14771c 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -852,16 +852,6 @@ const SfxItemSet& EditTextObjectImpl::GetParaAttribs(sal_Int32 nPara) const return rC.GetParaAttribs(); } -void EditTextObjectImpl::SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs) -{ - if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) - return; - - ContentInfo& rC = aContents[nPara]; - rC.GetParaAttribs().Set(rAttribs); - ClearPortionInfo(); -} - bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich ) { bool bChanged = false; diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 1aa5e23..c5ec2e6 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -248,7 +248,6 @@ public: bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const; const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const; - void SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs); void GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& eFamily) const; void SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& eFamily); diff --git a/unusedcode.easy b/unusedcode.easy index 8b4a18f..934e94f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -13,7 +13,6 @@ DocxSdrExport::setFlyFrameGraphic(bool) DocxSdrExport::setFrameBtLr(bool) EditEngine::IsIdleFormatterActive() const EditSelection::IsInvalid() const -EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&) FileStream::FileStream() FileStream::close() FileStream::createTempFile(rtl::OString const&) commit 77ec79022fc8312ceed8b324731a4eda231c7e0c Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 16:08:55 2014 +0200 constructor only used on WNT in FontSelectPatternAttributes Change-Id: Iffbd9702f5a81e4bfe3baa3952824f4c6ba3bca3 diff --git a/unusedcode.easy b/unusedcode.easy index 84213af..8b4a18f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -18,7 +18,6 @@ FileStream::FileStream() FileStream::close() FileStream::createTempFile(rtl::OString const&) FileStream::write(void const*, unsigned long) -FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool) GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 59d8bc7..77a3520 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -160,8 +160,10 @@ class FontSelectPatternAttributes : public ImplFontAttributes public: FontSelectPatternAttributes( const Font&, const OUString& rSearchName, const Size&, float fExactHeight ); +#ifdef WNT FontSelectPatternAttributes( const PhysicalFontFace&, const Size&, float fExactHeight, int nOrientation, bool bVertical ); +#endif size_t hashCode() const; bool operator==(const FontSelectPatternAttributes& rOther) const; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index de72610..c9ded12 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2060,6 +2060,7 @@ FontSelectPattern::FontSelectPattern( const Font& rFont, } // NOTE: this ctor is still used on Windows. Do not remove. +#ifdef WNT FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) : ImplFontAttributes( rFontData ) @@ -2076,7 +2077,6 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace // NOTE: no normalization for width/height/orientation } -#ifdef WNT FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) : FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical) commit 64977e5c2bc6f869cacfe589f9155396847d935c Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 16:04:27 2014 +0200 remove unused code FontSizeBox::GetValue(unsigned short, FieldUnit) Change-Id: I63df5364d69bf60e7a5ee2b5854b41ce27f10894 diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index f4752a9..6571ddd 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -524,7 +524,6 @@ public: virtual void SetValue( sal_Int64 nNewValue ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; virtual sal_Int64 GetValue() const; - sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const; private: // declared as private because some compilers would generate the default functions diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 8860c67..ea1cdee 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1974,25 +1974,6 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue ) -sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const -{ - if ( !bRelative ) - { - sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(ComboBox::GetEntryData( nPos ))); - if ( nComboVal < 0 ) // marked as special? - { - return MetricField::ConvertValue( -nComboVal, mnBaseValue, GetDecimalDigits(), - meUnit, eOutUnit ); - } - } - - // do normal font size processing - sal_Int64 nRetValue = MetricBox::GetValue( nPos, eOutUnit ); - return nRetValue; -} - - - sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const { if ( !bRelative ) diff --git a/unusedcode.easy b/unusedcode.easy index 4e9b238..84213af 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -19,7 +19,6 @@ FileStream::close() FileStream::createTempFile(rtl::OString const&) FileStream::write(void const*, unsigned long) FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool) -FontSizeBox::GetValue(unsigned short, FieldUnit) const GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() commit 98881b0a5574391dd98ff68d8b7453df1e3ca930 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 15:45:15 2014 +0200 remove unused code in vcl/ImplRegionBand ImplRegionBand::IsInside(long, long) ImplRegionBand::IsOver(long, long) Change-Id: I607c589d62a0c9178a32df5cf48fcbe279878030 diff --git a/unusedcode.easy b/unusedcode.easy index c4da897..4e9b238 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -24,8 +24,6 @@ GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() GDriveSession::GDriveSession() -ImplRegionBand::IsInside(long, long) -ImplRegionBand::IsOver(long, long) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&) Json::swap(Json&) diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index 5e8f5bd..0ef560e9 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -33,9 +33,6 @@ separation after creation. The separations are modified with basic clipping functions like Union and Intersection - the Class will process the clipping for the actual band. -The actual separations may be checked by functions like IsInside or -IsOver. - */ // element for the list with x-separations @@ -113,8 +110,6 @@ public: void ScaleX( double fHorzScale ); bool IsInside( long nX ); - bool IsInside( long nLeft, long nRight ); - bool IsOver( long nLeft, long nRight ); bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 59d9c91..1184c0d 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -849,38 +849,6 @@ bool ImplRegionBand::IsInside( long nX ) -bool ImplRegionBand::IsOver( long nLeft, long nRight ) -{ - ImplRegionBandSep* pSep = mpFirstSep; - while ( pSep ) - { - if ( (pSep->mnXLeft < nRight) && (pSep->mnXRight > nLeft) ) - return true; - - pSep = pSep->mpNextSep; - } - - return false; -} - - - -bool ImplRegionBand::IsInside( long nLeft, long nRight ) -{ - ImplRegionBandSep* pSep = mpFirstSep; - while ( pSep ) - { - if ( (pSep->mnXLeft >= nLeft) && (nRight <= pSep->mnXRight) ) - return true; - - pSep = pSep->mpNextSep; - } - - return false; -} - - - long ImplRegionBand::GetXLeftBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XLeftBoundary -> no separation in band!" ); commit e1b49cd30e3a245c236ad512622eeb0685c9d2be Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 15:38:41 2014 +0200 remove unused code ImportExcel::GetLastFormula(short) Change-Id: I0f2f4f1ea4c051e6a59f486effe756754005ceec diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index c207933..84cac05 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -186,12 +186,6 @@ void ImportExcel::SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt1 mpLastFormula = &it->second; } -ImportExcel::LastFormula* ImportExcel::GetLastFormula( SCCOL nCol ) -{ - LastFormulaMapType::iterator it = maLastFormulaCells.find(nCol); - return it == maLastFormulaCells.end() ? NULL : &it->second; -} - void ImportExcel::ReadFileSharing() { sal_uInt16 nRecommendReadOnly, nPasswordHash; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index d5290c3..e42cb71 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -127,7 +127,6 @@ protected: bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet. void SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt16 nXF, ScFormulaCell* pCell ); - LastFormula* GetLastFormula( SCCOL nCol ); // Record-Funktionen void ReadFileSharing(); diff --git a/unusedcode.easy b/unusedcode.easy index 3095aae..c4da897 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -26,7 +26,6 @@ GDriveProperty::GDriveProperty() GDriveSession::GDriveSession() ImplRegionBand::IsInside(long, long) ImplRegionBand::IsOver(long, long) -ImportExcel::GetLastFormula(short) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&) Json::swap(Json&) commit a4dd8a2106215a2ece33d1b82e8725d68ae2630b Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 14:57:24 2014 +0200 remove unused code from i18nlangtag/LanguageTag Specifically: LanguageTag::LanguageTag() LanguageTag::getRegion() const LanguageTag::reset(_rtl_Locale const&) Change-Id: I8822db6e1df7cd912e9ae82cb9d9f51370d4c583 diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 721bb31..6541c90 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -507,18 +507,6 @@ LanguageTag::LanguageTag( LanguageType nLanguage ) } -LanguageTag::LanguageTag() - : - mnLangID( LANGUAGE_DONTKNOW), - mbSystemLocale( false), - mbInitializedBcp47( false), - mbInitializedLocale( false), - mbInitializedLangID( true), - mbIsFallback( false) -{ -} - - LanguageTag::LanguageTag( const OUString& rBcp47, const OUString& rLanguage, const OUString& rScript, const OUString& rCountry ) : @@ -1067,14 +1055,6 @@ LanguageTag & LanguageTag::reset( LanguageType nLanguage ) } -LanguageTag & LanguageTag::reset( const rtl_Locale & rLocale ) -{ - reset( lang::Locale( rLocale.Language, rLocale.Country, rLocale.Variant)); - convertFromRtlLocale(); - return *this; -} - - bool LanguageTagImpl::canonicalize() { #ifdef erDEBUG @@ -1889,14 +1869,6 @@ OUString LanguageTagImpl::getRegion() const } -OUString LanguageTag::getRegion() const -{ - OUString aRet( getImpl()->getRegion()); - const_cast<LanguageTag*>(this)->syncFromImpl(); - return aRet; -} - - OUString LanguageTagImpl::getVariants() const { if (!mbCachedVariants) diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index d646127..dcb95c6 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -76,12 +76,6 @@ public: /** Init LanguageTag with LanguageType MS-LangID. */ explicit LanguageTag( LanguageType nLanguage ); - /** Default ctor, init LanguageTag with LanguageType LANGUAGE_DONTKNOW. - - To be able to use LanguageTag in maps etc., avoid otherwise. - */ - explicit LanguageTag(); - /** Init LanguageTag with either BCP 47 language tag (precedence if not empty), or a combination of language, script and country. @@ -181,13 +175,6 @@ public: */ OUString getCountry() const; - /** Get BCP 47 region tag, which may be an ISO 3166 country alpha code or - any other BCP 47 region tag. - - Always resolves an empty tag to the system locale. - */ - OUString getRegion() const; - /** Get BCP 47 variant subtags, of the IANA Language Subtag Registry. If there are multiple variant subtags they are separated by '-'. @@ -258,9 +245,6 @@ public: /** Reset with LanguageType MS-LangID. */ LanguageTag & reset( LanguageType nLanguage ); - /** Reset with rtl_Locale. */ - LanguageTag & reset( const rtl_Locale & rLocale ); - /** Fall back to a known locale. diff --git a/unusedcode.easy b/unusedcode.easy index a97ed09..3095aae 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -30,9 +30,6 @@ ImportExcel::GetLastFormula(short) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&) Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&) Json::swap(Json&) -LanguageTag::LanguageTag() -LanguageTag::getRegion() const -LanguageTag::reset(_rtl_Locale const&) ListBox::GetMRUCount() const MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short) MenuBar::GetMenuBarButtonRectPixel(unsigned short) commit 3543d2d20b9b4c2de69f4352b695bcf6e49e5fb9 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 13:27:29 2014 +0200 fix name of method in vcl/Menu, SetHightlightItem to SetHighlightItem Change-Id: I89a61aeffeebc69e06da6c1130436fb25528f1c7 diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 0cd9752..96cf410 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -236,7 +236,7 @@ public: sal_uInt16 GetCurItemId() const; OString GetCurItemIdent() const; - void SetHightlightItem(sal_uInt16 nHighlightedItem); + void SetHighlightItem(sal_uInt16 nHighlightedItem); void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } sal_uInt16 GetDefaultItem() const { return nDefaultItem; } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 49cc2b5..e2f71b6 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1574,7 +1574,7 @@ MenuItemType Menu::GetItemType( sal_uInt16 nPos ) const return MENUITEM_DONTKNOW; } -void Menu::SetHightlightItem( sal_uInt16 nItem ) +void Menu::SetHighlightItem( sal_uInt16 nItem ) { nHighlightedItem = nItem; } @@ -3985,7 +3985,7 @@ void MenuFloatingWindow::doShutdown() // otherwise the entry will not be read when the menu is opened again if( nHighlightedItem != ITEMPOS_INVALID ) pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); - pMenu->SetHightlightItem(ITEMPOS_INVALID); + pMenu->SetHighlightItem(ITEMPOS_INVALID); if( !bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->bIsMenuBar ) { // #102461# remove highlight in parent @@ -4638,7 +4638,7 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTime } } HighlightItem( nHighlightedItem, true ); - pMenu->SetHightlightItem(nHighlightedItem); + pMenu->SetHighlightItem(nHighlightedItem); pMenu->ImplCallHighlight( nHighlightedItem ); } else @@ -5544,7 +5544,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b HighlightItem( nHighlightedItem, true ); else if ( nRolloveredItem != ITEMPOS_INVALID ) HighlightItem( nRolloveredItem, true ); - pMenu->SetHightlightItem(nHighlightedItem); + pMenu->SetHighlightItem(nHighlightedItem); pMenu->ImplCallHighlight(nHighlightedItem); if( mbAutoPopup ) commit b26047be9fdd23efb9712e7c6aeeec22c26ed4dc Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 13:26:25 2014 +0200 remove unused code Menu::GetHighlightItem() Change-Id: I9b538bacbb98705b0345c3f6dc38fb554ce25bcf diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index ebb28a3..0cd9752 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -237,16 +237,15 @@ public: OString GetCurItemIdent() const; void SetHightlightItem(sal_uInt16 nHighlightedItem); - sal_uInt16 GetHighlightItem() const; void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } - sal_uInt16 GetDefaultItem() const { return nDefaultItem; } + sal_uInt16 GetDefaultItem() const { return nDefaultItem; } void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; void SetUserValue( sal_uInt16 nItemId, sal_uLong nValue ); - sal_uLong GetUserValue( sal_uInt16 nItemId ) const; + sal_uLong GetUserValue( sal_uInt16 nItemId ) const; void SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ); PopupMenu* GetPopupMenu( sal_uInt16 nItemId ) const; diff --git a/unusedcode.easy b/unusedcode.easy index 83821f1..a97ed09 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -34,7 +34,6 @@ LanguageTag::LanguageTag() LanguageTag::getRegion() const LanguageTag::reset(_rtl_Locale const&) ListBox::GetMRUCount() const -Menu::GetHighlightItem() const MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short) MenuBar::GetMenuBarButtonRectPixel(unsigned short) MenuBar::RemoveMenuBarButton(unsigned short) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 0494619..49cc2b5 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1579,11 +1579,6 @@ void Menu::SetHightlightItem( sal_uInt16 nItem ) nHighlightedItem = nItem; } -sal_uInt16 Menu::GetHighlightItem() const -{ - return nHighlightedItem; -} - sal_uInt16 Menu::GetCurItemId() const { return nSelectedId; commit 09e5de8278dd8f13adcf614db35c8a8a04ba8e47 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 13:12:56 2014 +0200 remove unused code in i18npool/OFileWriter Specifically: OFileWriter::flush() OFileWriter::writeDefaultParameter(char const*, rtl::OUString const&) OFileWriter::writeParameter(char const*, char const*, rtl::OUString const&) Change-Id: Ie359be257b3c7493e31fcf4201818c29c9c3df53 diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index 27b4586..59940db 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -57,14 +57,11 @@ public: void writeRefFunction3(const char *func, const OUString& useLocale) const; void writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const; bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const; - bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const; void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const; void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const; void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const; - void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; - void flush(void) const ; void closeOutput(void) const; /// Return the locale string, something like en_US or de_DE const char * getLocale() const { return theLocale; } diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index 53be916..0a83b42 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -138,13 +138,6 @@ bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUStrin return bBool; } -bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const -{ - bool bBool = (str == "true" ? 1 : 0); - fprintf(m_f,"static const sal_Unicode default%s[] = {%d};\n", pAsciiStr, bBool); - return bBool; -} - void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const { fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr); @@ -173,13 +166,6 @@ void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAscii fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const -{ - fprintf(m_f, "static const sal_Unicode %s%s[] = {", pTagStr, pAsciiStr); - writeStringCharacters(aChars); - fprintf(m_f, "0x0};\n"); -} - void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const { fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr, pAsciiStr, count0, count1); @@ -187,11 +173,6 @@ void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAscii fprintf(m_f, "0x0};\n"); } -void OFileWriter::flush(void) const -{ - fflush( m_f ); -} - void OFileWriter::closeOutput(void) const { if(m_f) diff --git a/unusedcode.easy b/unusedcode.easy index 388c562..83821f1 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -41,9 +41,6 @@ MenuBar::RemoveMenuBarButton(unsigned short) MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&) OAuth2Handler::OAuth2Handler() OAuth2Handler::getAccessToken() -OFileWriter::flush() const -OFileWriter::writeDefaultParameter(char const*, rtl::OUString const&) const -OFileWriter::writeParameter(char const*, char const*, rtl::OUString const&) const Options::Options() Options::getInputFiles() Options::getOption(rtl::OString const&) const commit c16e4b10196e73aec63be13488e235496946d8b7 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 11:49:27 2014 +0200 remove unused code PanelLayout::dispatch full signature: PanelLayout::dispatch( rtl::OUString const&, css::uno::Sequence<css::beans::PropertyValue> const&) Change-Id: Ib16c32d69e62ccf000de05da7c6f25e993a5be90 diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index fe55f11..74b5385 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -38,8 +38,6 @@ public: virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL); virtual void queue_resize(); - void dispatch(const OUString& rCommand, const css::uno::Sequence<css::beans::PropertyValue>& rArgs = - css::uno::Sequence<css::beans::PropertyValue>()); }; #endif diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 72bdfc2..9635fcc 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -91,21 +91,4 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, s VclContainer::setLayoutAllocation(*pChild, Point(0, 0), Size(nWidth, nHeight)); } -void PanelLayout::dispatch(const OUString& rCommand, const css::uno::Sequence<css::beans::PropertyValue>& rArgs) -{ - assert(getFrame().is()); - - css::util::URL aURL; - aURL.Complete = rCommand; - - css::uno::Reference<css::util::XURLTransformer > xURLTransformer( - css::util::URLTransformer::create(comphelper::getProcessComponentContext())); - - xURLTransformer->parseStrict(aURL); - - css::uno::Reference<css::frame::XDispatchProvider> xProvider(getFrame(), css::uno::UNO_QUERY_THROW); - css::uno::Reference<css::frame::XDispatch > xDispatch(xProvider->queryDispatch(aURL, OUString(), 0)); - xDispatch->dispatch(aURL, rArgs); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 2bc19fb..388c562 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -55,7 +55,6 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const -PanelLayout::dispatch(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) ScDocument::CreateFormatTable() const ScExtIButton::GetSelected() const commit 926583bd37fafad7f8eda82845f8d491eb41f7bf Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 10:43:16 2014 +0200 debug only code SalDisplay::PrintInfo() Change-Id: I9ead37ff69dc7198faae6758a346111ed1d029e3 diff --git a/unusedcode.easy b/unusedcode.easy index 2a800d1..2bc19fb 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -56,7 +56,6 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const PanelLayout::dispatch(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -SalDisplay::PrintInfo() const SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) ScDocument::CreateFormatTable() const ScExtIButton::GetSelected() const diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 3c80473..1125608 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -299,9 +299,9 @@ public: virtual ~SalDisplay(); void Init(); - void PrintInfo() const; #ifdef DBG_UTIL + void PrintInfo() const; void DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) const; #endif diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 23d296c..fda0b3d 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2150,7 +2150,6 @@ void SalDisplay::DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) cons pEvent->xany.send_event, pEvent->xany.window ); } -#endif void SalDisplay::PrintInfo() const { @@ -2193,6 +2192,7 @@ void SalDisplay::PrintInfo() const << " 0x" << GetVisual(m_nXDefaultScreen).green_mask << " 0x" << GetVisual(m_nXDefaultScreen).blue_mask); } +#endif void SalDisplay::addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ) { commit 9ee630ee01b890183d8e683d961d7c7337c54155 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 10:41:11 2014 +0200 remove unused code RecentDocsView::SetThumbnailSize(long) Change-Id: I9a898fda8e494693f48d7611c07bd65e86c22bdf diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 9308025..20f04c3 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -48,7 +48,6 @@ public: void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); void loadRecentDocs(); - void SetThumbnailSize(long thumbnailSize); long GetThumbnailSize() const; static bool typeMatchesExtension(ApplicationType type, const OUString &rExt); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 0592358..a97c7e7 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -321,12 +321,6 @@ void RecentDocsView::Paint( const Rectangle &aRect ) ThumbnailView::Paint(aRect); } -void RecentDocsView::SetThumbnailSize(long thumbnailSize) -{ - mnItemMaxSize = thumbnailSize; - setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, mnItemPadding ); -} - long RecentDocsView::GetThumbnailSize() const { return mnItemMaxSize; diff --git a/unusedcode.easy b/unusedcode.easy index 2da354b..2a800d1 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -56,7 +56,6 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const PanelLayout::dispatch(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -RecentDocsView::SetThumbnailSize(long) SalDisplay::PrintInfo() const SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) ScDocument::CreateFormatTable() const commit 2191ff899b77fac2d871427452832476cf6231e4 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 27 10:39:21 2014 +0200 debug only code Resource::TestRes() Change-Id: I00743ded162ea2772b2fe74df8aecf1fd3a390fa diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx index f8018af..251ad99 100644 --- a/include/tools/rc.hxx +++ b/include/tools/rc.hxx @@ -36,7 +36,9 @@ protected: void GetRes( const ResId& rResId ); // check Resource state +#ifdef DBG_UTIL void TestRes(); +#endif // Get a pointer to the Resource's data void* GetClassRes() diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 249c20c..ae9cd4c 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -394,11 +394,13 @@ void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr ) } } +#ifdef DBG_UTIL void Resource::TestRes() { if( m_pResMgr ) m_pResMgr->TestStack( this ); } +#endif struct ImpContent { diff --git a/unusedcode.easy b/unusedcode.easy index c3a47d0..2da354b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -57,7 +57,6 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const PanelLayout::dispatch(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) RecentDocsView::SetThumbnailSize(long) -Resource::TestRes() SalDisplay::PrintInfo() const SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) ScDocument::CreateFormatTable() const _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits