[PATCH] remove NfShCurrencyEntries and NfShCurrencyEntryPtr types

Daniel Di Marco d.dimarco at gmx.de
Mon Nov 21 14:10:50 PST 2011


---
 cui/source/tabpages/numfmt.cxx |    5 +----
 svx/inc/svx/numfmtsh.hxx       |    4 ----
 svx/source/items/numfmtsh.cxx  |    2 --
 unusedcode.easy                |    1 -
 4 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8c9ec83..5866cfc 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1739,16 +1739,13 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler )
 void SvxNumberFormatTabPage::FillCurrencyBox()
 {
     SvStringsDtor   aList;
-    NfShCurrencyEntries rEntries;
-    XubString*      pEntry = NULL;
     sal_uInt16  nSelPos=0;
 
     pNumFmtShell->GetCurrencySymbols( aList, &nSelPos);
 
     for(sal_uInt16 i=1;i<aList.Count();i++)
     {
-        pEntry=aList[i];
-        aLbCurrency.InsertEntry( *pEntry);
+        aLbCurrency.InsertEntry( *aList[i] );
     }
     aLbCurrency.SelectEntryPos(nSelPos);
 }
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 1fc0d7e..df2a42c 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -78,10 +78,6 @@ enum SvxNumberValueType
 
 #define NUMBERFORMAT_ENTRY_NEW_CURRENCY     NUMBERFORMAT_ENTRY_NOT_FOUND-1
 
-typedef NfCurrencyEntry* NfShCurrencyEntryPtr;
-SV_DECL_PTRARR( NfShCurrencyEntries, NfShCurrencyEntryPtr, 8, 1 )
-
-
 class SvxDelStrgs: public SvStrings
 {
 
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 31edcd6..5296abc 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -53,8 +53,6 @@
 
 const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789;
 
-SV_IMPL_PTRARR( NfShCurrencyEntries, NfCurrencyEntry* );
-
 // -----------------------------------------------------------------------
 
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 40bb39a..3855e2e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -241,7 +241,6 @@ NameNode::IsOrderTree() const
 NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
 NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
 NfCurrencyEntry::NfCurrencyEntry()
-NfShCurrencyEntries::DeleteAndDestroy(unsigned short, unsigned short)
 NotificationSettings::CopyData()
 NotifyBrokenPackage::isAborted()
 NumberFormatCodeWrapper::getDefault(short, short) const
-- 
1.7.7.3


--------------060203030107030509070603--


More information about the LibreOffice mailing list