From fc04f76336fdf8c96e35382cdeb497e2f939705c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 28 Sep 2014 15:49:26 +0200 Subject: fdo#82577: Handle Time Put the TOOLS Time class in the tools namespace. Avoids clash with the X11 Time typedef. Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866 Reviewed-on: https://gerrit.libreoffice.org/11684 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/inc/AnnotationWin.hxx | 2 +- sw/inc/SidebarWin.hxx | 2 +- sw/inc/docufld.hxx | 2 +- sw/inc/flddat.hxx | 4 ++-- sw/inc/shellio.hxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2 +- sw/source/core/doc/DocumentFieldsManager.cxx | 4 ++-- sw/source/core/doc/doccomp.cxx | 2 +- sw/source/core/doc/docdraw.cxx | 2 +- sw/source/core/doc/docglbl.cxx | 2 +- sw/source/core/fields/docufld.cxx | 10 +++++----- sw/source/core/fields/flddat.cxx | 6 +++--- sw/source/core/inc/swblocks.hxx | 2 +- sw/source/core/layout/layact.cxx | 2 +- sw/source/core/swg/swblocks.cxx | 4 ++-- sw/source/core/unocore/swunohelper.cxx | 2 +- sw/source/core/unocore/unocrsrhelper.cxx | 6 +++--- sw/source/filter/basflt/shellio.cxx | 6 +++--- sw/source/filter/html/htmlfld.cxx | 4 ++-- sw/source/filter/ww8/wrtww8.cxx | 6 +++--- sw/source/uibase/docvw/AnnotationWin.cxx | 2 +- sw/source/uibase/docvw/edtdd.cxx | 2 +- sw/source/uibase/docvw/srcedtw.cxx | 6 +++--- sw/source/uibase/fldui/fldmgr.cxx | 2 +- 24 files changed, 42 insertions(+), 42 deletions(-) (limited to 'sw') diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 7932c07cc03a..b0c527af522f 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -45,7 +45,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin virtual OUString GetAuthor() SAL_OVERRIDE; virtual Date GetDate() SAL_OVERRIDE; - virtual Time GetTime() SAL_OVERRIDE; + virtual tools::Time GetTime() SAL_OVERRIDE; virtual sal_uInt32 MoveCaret() SAL_OVERRIDE; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 3944f1b75654..290f8bbc42f9 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -103,7 +103,7 @@ class SwSidebarWin : public vcl::Window virtual OUString GetAuthor() = 0; virtual Date GetDate() = 0; - virtual Time GetTime() = 0; + virtual tools::Time GetTime() = 0; void ExecuteCommand(sal_uInt16 nSlot); void InitControls(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 250be7f7fe46..a70c885f63dd 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -465,7 +465,7 @@ public: inline const DateTime GetDateTime() const { return aDateTime; } inline const Date GetDate() const { return aDateTime.GetDate(); } - inline const Time GetTime() const { return aDateTime.GetTime(); } + inline const tools::Time GetTime() const { return aDateTime.GetTime(); } /// Author virtual OUString GetPar1() const SAL_OVERRIDE; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 8593b8d6d86b..2bfbec12cc6f 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -24,7 +24,7 @@ class DateTime; class Date; -class Time; +namespace tools { class Time; } enum SwDateFormat { @@ -115,7 +115,7 @@ public: inline long GetOffset() const { return nOffset; } Date GetDate(bool bUseOffset = false) const; - Time GetTime(bool bUseOffset = false) const; + tools::Time GetTime(bool bUseOffset = false) const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 3a0259b62d06..154e35008d1e 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -194,7 +194,7 @@ class SW_DLLPUBLIC Reader OUString aTemplateNm; Date aDStamp; - Time aTStamp; + tools::Time aTStamp; DateTime aChkDateTime; protected: diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index 923a82ffc969..ebe59144f1a0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -566,7 +566,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo81492, "fdo81492.docx") DECLARE_OOXMLEXPORT_TEST(testEditTime, "fdo81341.docx") { /* Issue was LO was not able to Import and Export EditTime in seconds format. - * It was supporting Time in "HH:MM" format. But if DOCX conatins Time in seconds, + * It was supporting tools::Time in "HH:MM" format. But if DOCX conatins tools::Time in seconds, * then LO was not able to display time in "HH:MM:SS" format. * While exporting LO was writing plian text instead of field entry. */ diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 728f349be297..6729812d07f5 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1289,7 +1289,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN else { nDate = Date( Date::SYSTEM ).GetDate(); - nTime = Time( Time::SYSTEM ).GetTime(); + nTime = tools::Time( tools::Time::SYSTEM ).GetTime(); } sal_uInt16 aTypes[5] = { @@ -1354,7 +1354,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN { bChgd = true; ((SwDateTimeField*)pFmtFld->GetField())->SetDateTime( - DateTime(Date(nDate), Time(nTime)) ); + DateTime(Date(nDate), tools::Time(nTime)) ); } break; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index cdb45d7e3736..2a418333d55e 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1649,7 +1649,7 @@ void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo ) ? xDocProps->getCreationDate() : xDocProps->getModificationDate() ); Date d(uDT.Day, uDT.Month, uDT.Year); - Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDT(d,t); if( !aTmp.isEmpty() ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 178e31d28e1a..37894e7595d4 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -577,7 +577,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) } else if ( pField && pField->ISA(SvxExtTimeField)) { - // Time field + // tools::Time field pInfo->SetRepresentation( ((const SvxExtTimeField*) pField)->GetFormatted( *GetNumberFormatter( true ), LANGUAGE_SYSTEM) ); diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 422f6fd5dc75..f5c4aed0844f 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -240,7 +240,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, DateTime aTmplDate( DateTime::SYSTEM ); { - Time a2Min( 0 ); a2Min.SetMin( 2 ); + tools::Time a2Min( 0 ); a2Min.SetMin( 2 ); aTmplDate += a2Min; } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 0289c2ce7243..23f00f8087ff 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -903,13 +903,13 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, sal_Int32 dur = xDocProps->getEditingDuration(); // If Seconds > 0 then bSec should be TRUE otherwise Seconds // information will be lost if file has EditTime in Seconds format. - aStr = pLocalData->getTime( Time(dur/3600, (dur%3600)/60, dur%60), + aStr = pLocalData->getTime( tools::Time(dur/3600, (dur%3600)/60, dur%60), (dur%60 > 0 ? true : false), false); } else { sal_Int32 dur = xDocProps->getEditingDuration(); - double fVal = Time(dur/3600, (dur%3600)/60, dur%60).GetTimeInDays(); + double fVal = tools::Time(dur/3600, (dur%3600)/60, dur%60).GetTimeInDays(); aStr = ExpandValue(fVal, nFormat, nLang); } break; @@ -938,7 +938,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, OUString aName( xDocProps->getAuthor() ); util::DateTime uDT( xDocProps->getCreationDate() ); Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDate(aD,aT); if( nSub == DI_CREATE ) ; // das wars schon!! @@ -947,7 +947,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, aName = xDocProps->getModifiedBy(); uDT = xDocProps->getModificationDate(); Date bD(uDT.Day, uDT.Month, uDT.Year); - Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime bDate(bD,bT); aDate = bDate; } @@ -956,7 +956,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, aName = xDocProps->getPrintedBy(); uDT = xDocProps->getPrintDate(); Date bD(uDT.Day, uDT.Month, uDT.Year); - Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime bDate(bD,bT); aDate = bDate; } diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index c410395b7d1b..da1be0abef08 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -148,15 +148,15 @@ Date SwDateTimeField::GetDate(bool bUseOffset) const return aDate; } -Time SwDateTimeField::GetTime(bool bUseOffset) const +tools::Time SwDateTimeField::GetTime(bool bUseOffset) const { double fDummy; double fFract = modf(GetValue(), &fDummy); DateTime aDT((long)fDummy, 0); aDT += fFract; if (bUseOffset) - aDT += Time(0, nOffset); - return (Time)aDT; + aDT += tools::Time(0, nOffset); + return (tools::Time)aDT; } bool SwDateTimeField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 263493d129cb..669fb0e6e3c4 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -61,7 +61,7 @@ protected: OUString sBaseURL; // base URL - has to be set at the Readers and Writers SwBlockNames aNames; // Liste aller Bausteine Date aDateModified; // fuers abgleichen bei den Aktionen - Time aTimeModified; + tools::Time aTimeModified; SwDoc* pDoc; // Austauschdokument sal_uInt16 nCur; // aktueller Index bool bReadOnly : 1; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 1902a01dc0ba..6e1c537c3860 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -114,7 +114,7 @@ void SwLayAction::CheckWaitCrsr() } } -// Time over already? +// tools::Time over already? inline void SwLayAction::CheckIdleEnd() { if ( !IsInput() ) diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index b8a3c6b3967a..77427c508f87 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -87,7 +87,7 @@ short SwImpBlocks::GetFileType( const OUString& rFile ) SwImpBlocks::SwImpBlocks( const OUString& rFile, bool ) : aFile( rFile ), aDateModified( Date::EMPTY ), - aTimeModified( Time::EMPTY ), + aTimeModified( tools::Time::EMPTY ), pDoc( 0 ), nCur( (sal_uInt16)-1 ), bReadOnly( true ), bInPutMuchBlocks( false ), bInfoChanged(false) @@ -193,7 +193,7 @@ void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong, bool SwImpBlocks::IsFileChanged() const { Date aTempDateModified( aDateModified ); - Time aTempTimeModified( aTimeModified ); + tools::Time aTempTimeModified( aTimeModified ); return FStatHelper::GetModifiedDateTimeOfFile( aFile, &aTempDateModified, &aTempTimeModified ) && ( aDateModified != aTempDateModified || diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 2fa3f5490af9..aeee2a3a7f18 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -240,7 +240,7 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, ::Date( aStamp.Day, aStamp.Month, aStamp.Year ), - ::Time( aStamp.Hours, + ::tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds, aStamp.NanoSeconds )); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 2207df9411cf..b5e3ecd4d417 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1206,7 +1206,7 @@ void makeRedline( SwPaM& rPaM, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwRedlineExtraData_FormattingChanges* pRedlineExtraData = NULL; @@ -1328,7 +1328,7 @@ void makeTableRowRedline( SwTableLine& rTableLine, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwTableRowRedline* pRedline = new SwTableRowRedline( aRedlineData, rTableLine ); @@ -1385,7 +1385,7 @@ void makeTableCellRedline( SwTableBox& rTableBox, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwTableCellRedline* pRedline = new SwTableCellRedline( aRedlineData, rTableBox ); diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 9c7898f93037..497d11c3015f 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -426,7 +426,7 @@ SwReader::SwReader( const uno::Reference < embed::XStorage > &rStg, const OUStri Reader::Reader() : pTemplate(0), aDStamp( Date::EMPTY ), - aTStamp( Time::EMPTY ), + aTStamp( tools::Time::EMPTY ), aChkDateTime( DateTime::EMPTY ), pStrm(0), pMedium(0), bInsertMode(false), bTmplBrowseMode(false), bReadUTF8(false), bBlockMode(false), bOrganizerMode(false), @@ -467,7 +467,7 @@ SwDoc* Reader::GetTemplateDoc() if( !pTemplate || aCurrDateTime >= aChkDateTime ) { Date aTstDate( Date::EMPTY ); - Time aTstTime( Time::EMPTY ); + tools::Time aTstTime( tools::Time::EMPTY ); if( FStatHelper::GetModifiedDateTimeOfFile( aTDir.GetMainURL( INetURLObject::NO_DECODE ), &aTstDate, &aTstTime ) && @@ -480,7 +480,7 @@ SwDoc* Reader::GetTemplateDoc() // only one minute later check if it has changed aChkDateTime = aCurrDateTime; - aChkDateTime += Time( 0L, 1L ); + aChkDateTime += tools::Time( 0L, 1L ); } if( bLoad ) diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 079f4792104d..d41a69f92db3 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -325,7 +325,7 @@ void SwHTMLParser::NewField() case RES_TIMEFLD: { sal_uLong nNumFmt = 0; - sal_Int64 nTime = Time( Time::SYSTEM ).GetTime(); + sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime(); sal_Int32 nDate = Date( Date::SYSTEM ).GetDate(); sal_uInt16 nSub = 0; bool bValidFmt = false; @@ -371,7 +371,7 @@ void SwHTMLParser::NewField() nSub, nNumFmt ); if (nSub & FIXEDFLD) - ((SwDateTimeField *)pFld)->SetDateTime( DateTime(Date(nDate), Time(nTime)) ); + ((SwDateTimeField *)pFld)->SetDateTime( DateTime(Date(nDate), tools::Time(nTime)) ); } break; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index a8d89f0ac326..eeda7ee6d2da 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -386,15 +386,15 @@ static void WriteDop( WW8Export& rWrt ) { ::util::DateTime uDT = xDocProps->getCreationDate(); Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmCreated = sw::ms::DateTime2DTTM(DateTime(aD,aT)); uDT = xDocProps->getModificationDate(); Date aD2(uDT.Day, uDT.Month, uDT.Year); - Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmRevised = sw::ms::DateTime2DTTM(DateTime(aD2,aT2)); uDT = xDocProps->getPrintDate(); Date aD3(uDT.Day, uDT.Month, uDT.Year); - Time aT3(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT3(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmLastPrint = sw::ms::DateTime2DTTM(DateTime(aD3,aT3)); } diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 403906adba7d..2c58a9b927da 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -308,7 +308,7 @@ Date SwAnnotationWin::GetDate() return mpFld->GetDate(); } -Time SwAnnotationWin::GetTime() +tools::Time SwAnnotationWin::GetTime() { return mpFld->GetTime(); } diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 855c80ff002b..13d5af0bcc78 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -345,7 +345,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) aWin.Bottom() -= nMargin; if(!aWin.IsInside(aPixPt)) { static sal_uLong last_tick = 0; - sal_uLong current_tick = Time::GetSystemTicks(); + sal_uLong current_tick = tools::Time::GetSystemTicks(); if((current_tick-last_tick) > 500) { last_tick = current_tick; if(!m_bOldIdleSet) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index b2363d593415..fc2a2daef1ad 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -574,7 +574,7 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll) IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) { - Time aSyntaxCheckStart( Time::SYSTEM ); + tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(pTextView == 0, "sw", "No View yet, but syntax highlighting?!"); bHighlighting = true; @@ -596,7 +596,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) nCount++; if(aSyntaxLineTable.empty()) break; - if((Time( Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime()) > MAX_HIGHLIGHTTIME ) + if((tools::Time( tools::Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime()) > MAX_HIGHLIGHTTIME ) { pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT ); break; @@ -611,7 +611,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) DoSyntaxHighlight( nLine ); aSyntaxLineTable.erase(nLine); nCount ++; - if(Time( Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime() > MAX_HIGHLIGHTTIME) + if(tools::Time( tools::Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime() > MAX_HIGHLIGHTTIME) { pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT ); break; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 8ad026f328b7..160fb15395bd 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1670,7 +1670,7 @@ sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberF fValue = aDate - *pNullDate; - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); sal_uLong nNumFmtTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L + (sal_uLong)aTime.GetHour() * 3600L; -- cgit