[Libreoffice-commits] .: 2 commits - vcl/inc vcl/source writerfilter/inc writerfilter/source
August Sodora
augsod at kemper.freedesktop.org
Mon Dec 19 20:11:42 PST 2011
vcl/inc/vcl/field.hxx | 9 --
vcl/source/control/field2.cxx | 92 ------------------------
writerfilter/inc/resourcemodel/TagLogger.hxx | 5 -
writerfilter/source/resourcemodel/TagLogger.cxx | 53 -------------
4 files changed, 159 deletions(-)
New commits:
commit b0e993d42e1df8c68c4c2684ab9dda27a1329594
Author: August Sodora <augsod at gmail.com>
Date: Mon Dec 19 21:56:10 2011 -0500
callcatcher: Remove unused code
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index d45637c..2a13487 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -73,14 +73,9 @@ namespace writerfilter
void element(const std::string & name);
void unoPropertySet(uno::Reference<beans::XPropertySet> rPropSet);
#endif
- void startElement(const std::string & name);
void attribute(const std::string & name, const std::string & value);
void attribute(const std::string & name, const ::rtl::OUString & value);
- void attribute(const std::string & name, sal_uInt32 value);
- void attribute(const std::string & name, const uno::Any aAny);
void chars(const std::string & chars);
- void chars(const ::rtl::OUString & chars);
- void endElement();
#ifdef DEBUG_CONTEXT_HANDLER
void propertySet(writerfilter::Reference<Properties>::Pointer_t props,
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 7b63ce0..6a0795c 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -156,13 +156,6 @@ namespace writerfilter
#endif
- void TagLogger::startElement(const string & name)
- {
- xmlChar* xmlName = xmlCharStrdup( name.c_str() );
- xmlTextWriterStartElement( pWriter, xmlName );
- xmlFree( xmlName );
- }
-
void TagLogger::attribute(const string & name, const string & value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
@@ -178,42 +171,6 @@ namespace writerfilter
attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
- void TagLogger::attribute(const string & name, sal_uInt32 value)
- {
- xmlChar* xmlName = xmlCharStrdup( name.c_str() );
- xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
- "%" SAL_PRIuUINT32, value );
- xmlFree( xmlName );
- }
-
- void TagLogger::attribute(const string & name, const uno::Any aAny)
- {
- string aTmpStrInt;
- string aTmpStrFloat;
- string aTmpStrString;
-
- sal_Int32 nInt = 0;
- float nFloat = 0.0;
- ::rtl::OUString aStr;
-
- xmlChar* xmlName = xmlCharStrdup( name.c_str() );
- if ( aAny >>= nInt )
- {
- xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
- "%" SAL_PRIdINT32, nInt );
- }
- else if ( aAny >>= nFloat )
- {
- xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
- "%f", nFloat );
- }
- else if ( aAny >>= aStr )
- {
- attribute( name, aStr );
- }
- xmlFree( xmlName );
- }
-
void TagLogger::chars(const string & rChars)
{
xmlChar* xmlChars = xmlCharStrdup( rChars.c_str() );
@@ -221,16 +178,6 @@ namespace writerfilter
xmlFree( xmlChars );
}
- void TagLogger::chars(const ::rtl::OUString & rChars)
- {
- chars(OUStringToOString(rChars, RTL_TEXTENCODING_ASCII_US).getStr());
- }
-
- void TagLogger::endElement()
- {
- xmlTextWriterEndElement( pWriter );
- }
-
#ifdef DEBUG_CONTEXT_HANDLER
class PropertySetDumpHandler : public Properties
{
commit f94db3d01631e75750431a87215338bf182f7c61
Author: August Sodora <augsod at gmail.com>
Date: Mon Dec 19 21:45:29 2011 -0500
callcatcher: Remove unused code
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 391a6e6..76a710d 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -386,8 +386,6 @@ public:
void SetDate( const Date& rNewDate );
void SetUserDate( const Date& rNewDate );
Date GetDate() const;
- Date GetRealDate() const;
- sal_Bool IsDateModified() const;
void SetEmptyDate();
sal_Bool IsEmptyDate() const;
Date GetCorrectedDate() const { return maCorrectedDate; }
@@ -835,7 +833,6 @@ class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
{
public:
DateBox( Window* pParent, WinBits nWinStyle );
- DateBox( Window* pParent, const ResId& rResId );
~DateBox();
virtual long PreNotify( NotifyEvent& rNEvt );
@@ -845,12 +842,6 @@ public:
virtual void Modify();
virtual void ReformatAll();
-
- void InsertDate( const Date& rDate, sal_uInt16 nPos = COMBOBOX_APPEND );
- void RemoveDate( const Date& rDate );
- using DateFormatter::GetDate;
- Date GetDate( sal_uInt16 nPos ) const;
- sal_uInt16 GetDatePos( const Date& rDate ) const;
};
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 0a2952b..59e0dbd 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1935,25 +1935,6 @@ Date DateFormatter::GetDate() const
// -----------------------------------------------------------------------
-Date DateFormatter::GetRealDate() const
-{
- // !!! TH-18.2.99: Wenn wir Zeit haben sollte dieses auch einmal
- // !!! fuer die Numeric-Klassen eingebaut werden.
-
- Date aDate( 0, 0, 0 );
-
- if ( GetField() )
- {
- if ( !ImplDateGetValue( GetField()->GetText(), aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) )
- if ( ImplAllowMalformedInput() )
- aDate = GetInvalidDate();
- }
-
- return aDate;
-}
-
-// -----------------------------------------------------------------------
-
void DateFormatter::SetEmptyDate()
{
FormatterBase::SetEmptyFieldValue();
@@ -1982,18 +1963,6 @@ sal_Bool DateFormatter::IsEmptyDate() const
// -----------------------------------------------------------------------
-sal_Bool DateFormatter::IsDateModified() const
-{
- if ( ImplGetEmptyFieldValue() )
- return !IsEmptyDate();
- else if ( GetDate() != maFieldDate )
- return sal_True;
- else
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void DateFormatter::Reformat()
{
if ( !GetField() )
@@ -2234,26 +2203,6 @@ DateBox::DateBox( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-DateBox::DateBox( Window* pParent, const ResId& rResId ) :
- ComboBox( WINDOW_DATEBOX )
-{
- rResId.SetRT( RSC_DATEBOX );
- WinBits nStyle = ImplInitRes( rResId );
- ComboBox::ImplInit( pParent, nStyle );
- SetField( this );
- SetText( ImplGetLocaleDataWrapper().getDate( ImplGetFieldDate() ) );
- ComboBox::ImplLoadRes( rResId );
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- DateFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
- Reformat();
-
- if ( !( nStyle & WB_HIDE ) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
DateBox::~DateBox()
{
}
@@ -2338,47 +2287,6 @@ void DateBox::ReformatAll()
// -----------------------------------------------------------------------
-void DateBox::InsertDate( const Date& rDate, sal_uInt16 nPos )
-{
- Date aDate = rDate;
- if ( aDate > GetMax() )
- aDate = GetMax();
- else if ( aDate < GetMin() )
- aDate = GetMin();
-
- ComboBox::InsertEntry( ImplGetDateAsText( aDate, GetFieldSettings() ), nPos );
-}
-
-// -----------------------------------------------------------------------
-
-void DateBox::RemoveDate( const Date& rDate )
-{
- ComboBox::RemoveEntry( ImplGetDateAsText( rDate, GetFieldSettings() ) );
-}
-
-// -----------------------------------------------------------------------
-
-Date DateBox::GetDate( sal_uInt16 nPos ) const
-{
- Date aDate( 0, 0, 0 );
- ImplDateGetValue( ComboBox::GetEntry( nPos ), aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetSettings() );
- return aDate;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 DateBox::GetDatePos( const Date& rDate ) const
-{
- XubString aStr;
- if ( IsLongFormat() )
- aStr = ImplGetLocaleDataWrapper().getLongDate( rDate, GetCalendarWrapper(), 1, sal_False, 1, !IsShowDateCentury() );
- else
- aStr = ImplGetLocaleDataWrapper().getDate( rDate );
- return ComboBox::GetEntryPos( aStr );
-}
-
-// -----------------------------------------------------------------------
-
static sal_Bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt,
sal_Bool bStrictFormat, sal_Bool bDuration,
TimeFieldFormat eFormat,
More information about the Libreoffice-commits
mailing list