diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-11-30 14:30:52 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-11-30 14:30:52 +0100 |
| commit | b211287c4acccce78576d4c13422399c2dff377f (patch) | |
| tree | decd5bdc0e097b183481340c241c86adb368197a | |
| parent | Version 3.5.0.0, tag libreoffice-3.5.0.0 (3.5.0-beta0) (diff) | |
| parent | convert over hidden windows-only ByteStrings (diff) | |
| download | binfilter-b211287c4acccce78576d4c13422399c2dff377f.tar.gz binfilter-b211287c4acccce78576d4c13422399c2dff377f.zip | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/binfilter
| -rw-r--r-- | binfilter/bf_sc/source/core/tool/sc_interpr2.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_sfx2/source/doc/timestamp.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_so3/source/solink/impldde.cxx | 11 | ||||
| -rw-r--r-- | binfilter/bf_svtools/source/items1/svt_dateitem.cxx | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx index e585be335..edb639f66 100644 --- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx @@ -75,7 +75,7 @@ namespace binfilter { /*N*/ } /*N*/ Date aDate(1, nM, nY); /*N*/ aDate += nDay - 1; -/*N*/ if (aDate.IsValid()) +/*N*/ if (aDate.IsValidAndGregorian()) /*N*/ return (double) (aDate - *(pFormatter->GetNullDate())); /*N*/ else /*N*/ { diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx b/binfilter/bf_sfx2/source/doc/timestamp.cxx index 6c42d1ee2..233ec59b9 100644 --- a/binfilter/bf_sfx2/source/doc/timestamp.cxx +++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx @@ -186,7 +186,7 @@ BOOL TimeStamp::IsValid () const // The name can have a defaultvalue! // And its better to safe this result in a local variable ... for better debug! (to see value) BOOL bResult = ( m_aModifiedDateTime != TIMESTAMP_INVALID_DATETIME ) ; - return bResult && m_aModifiedDateTime.IsValid(); + return bResult && m_aModifiedDateTime.IsValidAndGregorian(); } diff --git a/binfilter/bf_so3/source/solink/impldde.cxx b/binfilter/bf_so3/source/solink/impldde.cxx index b05fbff73..13c59841c 100644 --- a/binfilter/bf_so3/source/solink/impldde.cxx +++ b/binfilter/bf_so3/source/solink/impldde.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <sot/exchange.hxx> +#include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <bf_so3/iface.hxx> @@ -196,11 +197,13 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink ) // Server nicht da, starten und nochmal versuchen if( !bInWinExec ) { - ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US ); - aCmdLine.Append( ".exe " ); - aCmdLine.Append( ByteString( sTopic, RTL_TEXTENCODING_ASCII_US ) ); + rtl::OStringBuffer aCmdLine(rtl::OUStringToOString(sServer, + RTL_TEXTENCODING_ASCII_US)); + aCmdLine.append(".exe "); + aCmdLine.append(rtl::OUStringToOString(sTopic, + RTL_TEXTENCODING_ASCII_US)); - if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED ) < 32 ) + if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) nError = DDELINK_ERROR_APP; else { diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx index 61f74b760..38abd6b2d 100644 --- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx +++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx @@ -137,7 +137,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation ) const { DBG_CHKTHIS(SfxDateTimeItem, 0); - if (aDateTime.IsValid()) + if (aDateTime.IsValidAndGregorian()) if (pIntlWrapper) { rText = pIntlWrapper->getLocaleData()->getDate(aDateTime); |