[Libreoffice-commits] .: 2 commits - l10ntools/inc l10ntools/source registry/source svl/inc svl/source svx/inc svx/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Ivan Timofeev
ivantimofeev at kemper.freedesktop.org
Sun Feb 19 03:57:14 PST 2012
l10ntools/inc/export.hxx | 1 -
l10ntools/source/merge.cxx | 16 ----------------
registry/source/keyimpl.cxx | 8 --------
registry/source/keyimpl.hxx | 1 -
svl/inc/svl/zforlist.hxx | 1 -
svl/source/numbers/zforlist.cxx | 9 ---------
svx/inc/svx/svdetc.hxx | 1 -
svx/source/svdraw/svdetc.cxx | 5 -----
unotools/inc/unotools/numberformatcodewrapper.hxx | 1 -
unotools/source/i18n/numberformatcodewrapper.cxx | 16 ----------------
unusedcode.easy | 6 ------
vcl/inc/vcl/menu.hxx | 1 -
vcl/source/window/menu.cxx | 9 ---------
13 files changed, 75 deletions(-)
New commits:
commit 1cb79c8bf9ca11f794c03407155e57fe0d893257
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sun Feb 19 15:56:02 2012 +0400
remove the function declatation as well
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 97c5bf1..ff8a679 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -426,7 +426,6 @@ public:
void Insert( PFormEntrys* pfEntrys );
PFormEntrys* GetPFObject( const rtl::OString &rPFO );
- rtl::OString Dump();
sal_Bool operator==( ResData *pData );
};
commit 37159db96ff0ce15b0b91502ba79a86f21a8f29a
Author: Petr Vorel <petr.vorel at gmail.com>
Date: Sat Feb 18 23:50:22 2012 +0100
Remove unused code
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index b9b8d40..55c62d1 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -129,22 +129,6 @@ void MergeData::Insert(PFormEntrys* pfEntrys )
aMap.insert( PFormEntrysHashMap::value_type( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) , pfEntrys ) );
}
-rtl::OString MergeData::Dump()
-{
- printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",
- sTyp.getStr(), sGID.getStr(), sLID.getStr(), sFilename.getStr());
-
- PFormEntrysHashMap::const_iterator idbg;
- for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
- {
- printf("aMap[ %s ] = " ,idbg->first.getStr());
- ( (PFormEntrys*)(idbg->second) )->Dump();
- printf("\n");
- }
- printf("\n");
- return rtl::OString(RTL_CONSTASCII_STRINGPARAM("MergeData\n"));
-}
-
PFormEntrys* MergeData::GetPFObject( const rtl::OString& rPFO )
{
if( aMap.find( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index c48ae9c..adbb49e 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -61,14 +61,6 @@ ORegKey::~ORegKey()
}
//*********************************************************************
-// acquireKey
-//
-RegError ORegKey::acquireKey(RegKeyHandle hKey)
-{
- return m_pRegistry->acquireKey(hKey);
-}
-
-//*********************************************************************
// releaseKey
//
RegError ORegKey::releaseKey(RegKeyHandle hKey)
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index a384d20..fbd9c4c 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -46,7 +46,6 @@ public:
sal_uInt32 release()
{ return --m_refCount; }
- RegError acquireKey(RegKeyHandle hKey);
RegError releaseKey(RegKeyHandle hKey);
RegError createKey(const rtl::OUString& keyName, RegKeyHandle* phNewKey);
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index a8cca86..69645e1 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -247,7 +247,6 @@ private:
public:
- NfCurrencyEntry();
NfCurrencyEntry( const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
NfCurrencyEntry(
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 2ee058f..ca3ca49 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3798,15 +3798,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
//--- NfCurrencyEntry ----------------------------------------------------
-NfCurrencyEntry::NfCurrencyEntry()
- : eLanguage( LANGUAGE_DONTKNOW ),
- nPositiveFormat(3),
- nNegativeFormat(8),
- nDigits(2),
- cZeroChar('0')
-{
-}
-
NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, LanguageType eLang )
{
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index b547289..08ba835 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -256,7 +256,6 @@ public:
OLEObjCache();
SVX_DLLPUBLIC ~OLEObjCache();
- void SetSize(sal_uIntPtr nNewSize);
void InsertObj(SdrOle2Obj* pObj);
void RemoveObj(SdrOle2Obj* pObj);
};
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 2672e82..0cc3c01 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -174,11 +174,6 @@ void OLEObjCache::UnloadOnDemand()
}
}
-void OLEObjCache::SetSize(sal_uIntPtr nNewSize)
-{
- nSize = nNewSize;
-}
-
void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
{
if ( Count() )
diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/unotools/inc/unotools/numberformatcodewrapper.hxx
index f0bf53f..9adb59d 100644
--- a/unotools/inc/unotools/numberformatcodewrapper.hxx
+++ b/unotools/inc/unotools/numberformatcodewrapper.hxx
@@ -67,7 +67,6 @@ public:
// Wrapper implementations of class NumberFormatCodeMapper
- ::com::sun::star::i18n::NumberFormatCode getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage ) const;
::com::sun::star::i18n::NumberFormatCode getFormatCode( sal_Int16 nFormatIndex ) const;
::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > getAllFormatCode( sal_Int16 nFormatUsage ) const;
::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > getAllFormatCodes() const;
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index f341f2f..759352f 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -63,22 +63,6 @@ void NumberFormatCodeWrapper::setLocale( const ::com::sun::star::lang::Locale& r
::com::sun::star::i18n::NumberFormatCode
-NumberFormatCodeWrapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage ) const
-{
- try
- {
- if ( xNFC.is() )
- return xNFC->getDefault( formatType, formatUsage, aLocale );
- }
- catch ( const Exception& )
- {
- SAL_WARN( "unotools.i18n", "getDefault: Exception caught!" );
- }
- return ::com::sun::star::i18n::NumberFormatCode();
-}
-
-
-::com::sun::star::i18n::NumberFormatCode
NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
{
try
diff --git a/unusedcode.easy b/unusedcode.easy
index b4778fd..a4136b8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -39,17 +39,11 @@ MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Referenc
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
-MenuBar::MenuBar(ResId const&)
-MergeData::Dump()
-NfCurrencyEntry::NfCurrencyEntry()
-NumberFormatCodeWrapper::getDefault(short, short) const
NumericBox::GetValue(unsigned short) const
NumericBox::GetValuePos(long) const
NumericBox::RemoveValue(long)
NumericFormatter::ConvertToFraction(long)
NumericFormatter::ConvertToLong(Fraction const&)
-OLEObjCache::SetSize(unsigned long)
-ORegKey::acquireKey(void*)
OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const
ParagraphStyleManager::get(WPXString const&) const
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 209aef6..dd7f5c1 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -399,7 +399,6 @@ class VCL_DLLPUBLIC MenuBar : public Menu
public:
MenuBar();
- MenuBar( const ResId& rResId );
MenuBar( const MenuBar& rMenu );
~MenuBar();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 11c7d04..c8e31d2 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3283,15 +3283,6 @@ MenuBar::MenuBar( const MenuBar& rMenu ) : Menu( sal_True )
bIsMenuBar = sal_True;
}
-MenuBar::MenuBar( const ResId& rResId ) : Menu ( sal_True )
-{
- mbDisplayable = sal_True;
- mbCloserVisible = sal_False;
- mbFloatBtnVisible = sal_False;
- mbHideBtnVisible = sal_False;
- ImplLoadRes( rResId );
-}
-
MenuBar::~MenuBar()
{
ImplDestroy( this, sal_True );
More information about the Libreoffice-commits
mailing list