binfilter/bf_starmath/source/starmath_parse.cxx | 2 +- binfilter/bf_svtools/source/misc/tl_strimp.cxx | 13 ------------- binfilter/bf_svtools/source/misc/tl_tustring.cxx | 13 +++++++++++++ binfilter/inc/bf_sc/conditio.hxx | 2 +- binfilter/inc/bf_svx/svdio.hxx | 2 +- binfilter/inc/bf_tools/string.hxx | 1 - 6 files changed, 16 insertions(+), 17 deletions(-)
New commits: commit 482881720eef9228ce25fa1d228139ebd43fe9cd Author: Caolán McNamara <caol...@redhat.com> Date: Thu Feb 16 10:25:42 2012 +0000 sync up post ByteString reduction diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx index 33df5b1..8cb5b88 100644 --- a/binfilter/bf_starmath/source/starmath_parse.cxx +++ b/binfilter/bf_starmath/source/starmath_parse.cxx @@ -1847,7 +1847,7 @@ const sal_Int32 coNumContFlags = /*N*/ } /*N*/ /*N*/ // get number argument -/*N*/ double fTmp; +/*N*/ double fTmp(0.0); /*N*/ Fraction aValue; /*N*/ if(lcl_IsNumber(CurToken.aText) && /*N*/ sscanf(rtl::OUStringToOString(CurToken.aText, RTL_TEXTENCODING_ASCII_US).getStr(), "%lf", &fTmp) == 1) diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx b/binfilter/bf_svtools/source/misc/tl_strimp.cxx index 81f864c..b0d7279 100644 --- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx +++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx @@ -219,19 +219,6 @@ STRING::STRING( const STRING& rStr ) mpData = rStr.mpData; } -STRING::STRING( const ::STRING& rStr ) -{ - DBG_CTOR( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - // this is good enough for binfilter... - STRING temp; - temp.Assign(rStr); - - STRING_ACQUIRE((STRING_TYPE *)temp.mpData); - mpData = temp.mpData; -} - // ----------------------------------------------------------------------- STRING::STRING( const STRING& rStr, xub_StrLen nPos, xub_StrLen nLen ) diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx b/binfilter/bf_svtools/source/misc/tl_tustring.cxx index a4b4880..4657cd8 100644 --- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx +++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx @@ -614,6 +614,19 @@ STRING& STRING::EraseTrailingChars( STRCODE c ) return *this; } +STRING::STRING( const ::STRING& rStr ) +{ + DBG_CTOR( STRING, DBGCHECKSTRING ); + DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); + + // this is good enough for binfilter... + STRING temp; + temp.Assign(rStr); + + STRING_ACQUIRE((STRING_TYPE *)temp.mpData); + mpData = temp.mpData; +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/inc/bf_sc/conditio.hxx b/binfilter/inc/bf_sc/conditio.hxx index c2771ea..1ad0c29 100644 --- a/binfilter/inc/bf_sc/conditio.hxx +++ b/binfilter/inc/bf_sc/conditio.hxx @@ -114,7 +114,7 @@ public: ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln // echte Kopie der Formeln (fuer Ref-Undo): ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r ); - ~ScConditionEntry(); + virtual ~ScConditionEntry(); int operator== ( const ScConditionEntry& r ) const; diff --git a/binfilter/inc/bf_svx/svdio.hxx b/binfilter/inc/bf_svx/svdio.hxx index 37abf5b..ea967d6 100644 --- a/binfilter/inc/bf_svx/svdio.hxx +++ b/binfilter/inc/bf_svx/svdio.hxx @@ -262,7 +262,7 @@ protected: public: // Als Modus muss STREAM_READ oder STREAM_WRITE angegeben werden. SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode, BOOL bAutoOpen = TRUE); - ~SdrDownCompat(); + virtual ~SdrDownCompat(); #ifdef DBG_UTIL // fuer etwas aussagekraeftigere Assertions diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx index b5944c0..872136e 100644 --- a/binfilter/inc/bf_tools/string.hxx +++ b/binfilter/inc/bf_tools/string.hxx @@ -141,7 +141,6 @@ private: public: ByteString(); ByteString( const ByteString& rStr ); - ByteString( const ::ByteString& rStr ); ByteString( const ByteString& rStr, xub_StrLen nPos, xub_StrLen nLen ); ByteString( const rtl::OString& rStr ); ByteString( const sal_Char* pCharStr );
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits