Kaydet (Commit) 5c3b0251 authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: remove code, hide's erAcks to-do code behind an ifdef

üst 684d499a
...@@ -795,16 +795,4 @@ LwpTabOverride* LwpParaStyle::GetTabOverride() const ...@@ -795,16 +795,4 @@ LwpTabOverride* LwpParaStyle::GetTabOverride() const
return NULL; return NULL;
} }
sal_Bool LwpParaStyle::IsNumberRight()
{
LwpAlignmentOverride* pAlign = GetAlignment();
if (pAlign)
{
LwpAlignmentOverride::AlignType type;
type = pAlign->GetAlignType();
if (type == LwpAlignmentOverride::ALIGN_NUMERICRIGHT)
return sal_True;
}
return sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -105,8 +105,6 @@ public: ...@@ -105,8 +105,6 @@ public:
LwpTabOverride* GetTabOverride() const; LwpTabOverride* GetTabOverride() const;
LwpBulletOverride* GetBulletOverride() const; LwpBulletOverride* GetBulletOverride() const;
LwpNumberingOverride* GetNumberingOverride() const; LwpNumberingOverride* GetNumberingOverride() const;
sal_Bool IsNumberRight();
public: public:
static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders); static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders);
//end //end
......
...@@ -101,14 +101,18 @@ class SvNumberNatNum ...@@ -101,14 +101,18 @@ class SvNumberNatNum
public: public:
static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, bool bDate ); static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, bool bDate );
#ifdef THE_FUTURE
static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate ); static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate );
#endif
SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0), SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0),
bDBNum(0), bDate(0), bSet(0) {} bDBNum(0), bDate(0), bSet(0) {}
bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; } bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; }
sal_uInt8 GetRawNum() const { return nNum; } sal_uInt8 GetRawNum() const { return nNum; }
sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; } sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; }
#ifdef THE_FUTURE
sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); } sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); }
#endif
LanguageType GetLang() const { return eLang; } LanguageType GetLang() const { return eLang; }
void SetLang( LanguageType e ) { eLang = e; } void SetLang( LanguageType e ) { eLang = e; }
void SetNum( sal_uInt8 nNumber, bool bDBNumber ) void SetNum( sal_uInt8 nNumber, bool bDBNumber )
...@@ -434,6 +438,7 @@ public: ...@@ -434,6 +438,7 @@ public:
calling this method. */ calling this method. */
void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const; void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const;
#ifdef THE_FUTURE
/** Switches to the first specified calendar, if any, in subformat nNumFor /** Switches to the first specified calendar, if any, in subformat nNumFor
(0..3). Original calendar name and date/time returned, but only if (0..3). Original calendar name and date/time returned, but only if
calendar switched and rOrgCalendar was empty. calendar switched and rOrgCalendar was empty.
...@@ -450,7 +455,7 @@ public: ...@@ -450,7 +455,7 @@ public:
fOrgDateTime, NumFor[nNumFor] ); fOrgDateTime, NumFor[nNumFor] );
return false; return false;
} }
#endif
private: private:
ImpSvNumFor NumFor[4]; // Array for the 4 subformats ImpSvNumFor NumFor[4]; // Array for the 4 subformats
String sFormatstring; // The format code string String sFormatstring; // The format code string
...@@ -471,8 +476,10 @@ private: ...@@ -471,8 +476,10 @@ private:
SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
#ifdef THE_FUTURE
SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const; double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const;
#endif
#ifdef _ZFORMAT_CXX // ----- private implementation methods ----- #ifdef _ZFORMAT_CXX // ----- private implementation methods -----
......
...@@ -1028,7 +1028,6 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter, ...@@ -1028,7 +1028,6 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter,
} }
if ( bFormatTurn ) if ( bFormatTurn )
{ {
#if 0
/* TODO: /* TODO:
We are currently not able to fully support a switch to another calendar during We are currently not able to fully support a switch to another calendar during
input for the following reasons: input for the following reasons:
...@@ -1055,6 +1054,7 @@ input for the following reasons: ...@@ -1055,6 +1054,7 @@ input for the following reasons:
calendar would have to be implemented. No problem. calendar would have to be implemented. No problem.
*/ */
#ifdef THE_FUTURE
if ( pFormat->IsOtherCalendar( nStringScanNumFor ) ) if ( pFormat->IsOtherCalendar( nStringScanNumFor ) )
pFormat->SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime ); pFormat->SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
else else
......
...@@ -246,7 +246,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang ...@@ -246,7 +246,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang
return nNatNum; return nNatNum;
} }
#ifdef THE_FUTURE
/* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please /* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please
* don't remove it in case we'd have to use it for some obscure exports to * don't remove it in case we'd have to use it for some obscure exports to
* Excel. */ * Excel. */
...@@ -329,6 +329,7 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan ...@@ -329,6 +329,7 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan
} }
return nDBNum; return nDBNum;
} }
#endif
/***********************Funktionen SvNumFor******************************/ /***********************Funktionen SvNumFor******************************/
...@@ -3032,6 +3033,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl ...@@ -3032,6 +3033,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl
} }
#ifdef THE_FUTURE
/* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently /* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently
* unused please don't remove it, it would be needed by * unused please don't remove it, it would be needed by
* SwitchToSpecifiedCalendar(), see comment in * SwitchToSpecifiedCalendar(), see comment in
...@@ -3059,6 +3061,7 @@ bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, ...@@ -3059,6 +3061,7 @@ bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
} }
return false; return false;
} }
#endif
// static // static
void SvNumberformat::ImpAppendEraG( String& OutString, void SvNumberformat::ImpAppendEraG( String& OutString,
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment