diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dbgui/scendlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/printfun.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/highred.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/sharedocdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun6.cxx | 6 |
10 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 9ba5f255481b..8c210054bc23 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -86,7 +86,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, OUString aComment(sCreatedBy + " " + aUserOpt.GetFirstName() + " " +aUserOpt.GetLastName() + ", " + sOn + " " + ScGlobal::GetpLocaleData()->getDate(Date(Date::SYSTEM)) - + ", " + ScGlobal::GetpLocaleData()->getTime(Time(Time::SYSTEM))); + + ", " + ScGlobal::GetpLocaleData()->getTime(tools::Time(tools::Time::SYSTEM))); m_pEdComment->SetText(aComment); m_pEdName->SetText(rName); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 6449cbcae873..ba92b732dbbb 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2071,7 +2071,7 @@ void ScExternalRefManager::enableDocTimer( bool bEnable ) { DocShellMap::iterator it = maDocShells.begin(), itEnd = maDocShells.end(); for (; it != itEnd; ++it) - it->second.maLastAccess = Time(Time::SYSTEM); + it->second.maLastAccess = tools::Time(tools::Time::SYSTEM); maSrcDocTimer.Start(); } @@ -2272,7 +2272,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) // document already loaded. SfxObjectShell* p = itr->second.maShell; - itr->second.maLastAccess = Time( Time::SYSTEM ); + itr->second.maLastAccess = tools::Time( tools::Time::SYSTEM ); return &static_cast<ScDocShell*>(p)->GetDocument(); } @@ -2283,7 +2283,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) //document is unsaved document SfxObjectShell* p = itr->second.maShell; - itr->second.maLastAccess = Time( Time::SYSTEM ); + itr->second.maLastAccess = tools::Time( tools::Time::SYSTEM ); return &static_cast<ScDocShell*>(p)->GetDocument(); } @@ -2747,13 +2747,13 @@ bool ScExternalRefManager::refreshSrcDocument(sal_uInt16 nFileId) { it->second.maShell->DoClose(); it->second.maShell = xDocShell; - it->second.maLastAccess = Time(Time::SYSTEM); + it->second.maLastAccess = tools::Time(tools::Time::SYSTEM); } else { SrcShell aSrcDoc; aSrcDoc.maShell = xDocShell; - aSrcDoc.maLastAccess = Time(Time::SYSTEM); + aSrcDoc.maLastAccess = tools::Time(tools::Time::SYSTEM); cacheNewDocShell(nFileId, aSrcDoc); } @@ -2947,7 +2947,7 @@ void ScExternalRefManager::purgeStaleSrcDocument(sal_Int32 nTimeOut) for (; itr != itrEnd; ++itr) { // in 100th of a second. - sal_Int32 nSinceLastAccess = (Time( Time::SYSTEM ) - itr->second.maLastAccess).GetTime(); + sal_Int32 nSinceLastAccess = (tools::Time( tools::Time::SYSTEM ) - itr->second.maLastAccess).GetTime(); if (nSinceLastAccess >= nTimeOut) { // Timed out. Let's close this, and exit the loop. diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index e6a247add44a..2d0f7ea502e6 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -48,7 +48,7 @@ private: long nTabStart; // First (real) page of the sheet long nDisplayStart; // same as above, relative to the start of counting Date aDate; - Time aTime; + tools::Time aTime; long nTotalPages; Size aPageSize; // for GetOptimalZoom ScPrintState aState; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 264ee8d9c367..1b99dd51da22 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -245,7 +245,7 @@ public: void SetOffset( const Point& rOfs ); void SetManualZoom( sal_uInt16 nNewZoom ); - void SetDateTime( const Date& rDate, const Time& rTime ); + void SetDateTime( const Date& rDate, const tools::Time& rTime ); void SetClearFlag( bool bFlag ); void SetUseStyleColor( bool bFlag ); diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index c7f5a684168d..bddfdef57fc0 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -214,9 +214,9 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) ScChgsDateMode eMode = (ScChgsDateMode) m_pFilterCtr->GetDateMode(); aChangeViewSet.SetTheDateMode( eMode ); Date aFirstDate( m_pFilterCtr->GetFirstDate() ); - Time aFirstTime( m_pFilterCtr->GetFirstTime() ); + tools::Time aFirstTime( m_pFilterCtr->GetFirstTime() ); Date aLastDate( m_pFilterCtr->GetLastDate() ); - Time aLastTime( m_pFilterCtr->GetLastTime() ); + tools::Time aLastTime( m_pFilterCtr->GetLastTime() ); aChangeViewSet.SetTheFirstDateTime( DateTime( aFirstDate, aFirstTime ) ); aChangeViewSet.SetTheLastDateTime( DateTime( aLastDate, aLastTime ) ); aChangeViewSet.SetHasAuthor(m_pFilterCtr->IsAuthor()); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 562342bf20e8..87b9bbe89f1c 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -174,7 +174,7 @@ void ScShareDocumentDlg::UpdateView() sal_uInt16 nHours = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); sal_uInt16 nMinutes = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); Date aDate( nDay, nMonth, nYear ); - Time aTime( nHours, nMinutes ); + tools::Time aTime( nHours, nMinutes ); DateTime aDateTime( aDate, aTime ); OUString aString( aUser ); @@ -229,7 +229,7 @@ void ScShareDocumentDlg::UpdateView() util::DateTime uDT(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 aDateTime(d,t); aString += formatTime(aDateTime, *ScGlobal::pLocaleData); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 36da2966796b..e8afa40eab5b 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -944,7 +944,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno:: else if (rName == SC_UNONAME_DATETIME) { maDateTime = rVal.get<util::DateTime>(); - Time aTime(maDateTime.Hours, maDateTime.Minutes, maDateTime.Seconds, maDateTime.NanoSeconds); + tools::Time aTime(maDateTime.Hours, maDateTime.Minutes, maDateTime.Seconds, maDateTime.NanoSeconds); p->SetFixTime(aTime); } else if (rName == SC_UNONAME_NUMFMT) @@ -1043,7 +1043,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) if (rName == SC_UNONAME_DATETIME) { - Time aT(p->GetFixTime()); + tools::Time aT(p->GetFixTime()); maDateTime.Year = 0; maDateTime.Month = 0; maDateTime.Day = 0; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index dbd970d60af7..e7cad9911d72 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -96,7 +96,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* nTabStart( 0 ), nDisplayStart( 0 ), aDate( Date::SYSTEM ), - aTime( Time::SYSTEM ), + aTime( tools::Time::SYSTEM ), nTotalPages( 0 ), pLocationData( NULL ), pDrawView( NULL ), @@ -695,7 +695,7 @@ void ScPreview::DataChanged(bool bNewTime) if (bNewTime) { aDate = Date( Date::SYSTEM ); - aTime = Time( Time::SYSTEM ); + aTime = tools::Time( tools::Time::SYSTEM ); } bValid = false; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 87c65ee90c82..bb379604e695 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1032,7 +1032,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) else aFieldData.nTotalPages = nTotalPages; - SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) ); + SetDateTime( Date( Date::SYSTEM ), tools::Time( tools::Time::SYSTEM ) ); if( pDocShell->getDocProperties()->getTitle().getLength() != 0 ) aFieldData.aTitle = pDocShell->getDocProperties()->getTitle(); @@ -1068,7 +1068,7 @@ void ScPrintFunc::GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ) rDocFtr = aFtr.nHeight; } -void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) +void ScPrintFunc::SetDateTime( const Date& rDate, const tools::Time& rTime ) { aFieldData.aDate = rDate; aFieldData.aTime = rTime; diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 838b82c43789..228e1b45703d 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -281,7 +281,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) break; case NUMBERFORMAT_TIME: { - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = aActTime.GetTimeInDays(); } break; @@ -394,7 +394,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) break; case NUMBERFORMAT_TIME: { - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = aActTime.GetTimeInDays(); } break; @@ -404,7 +404,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) case NUMBERFORMAT_DATE: { double fDate = rtl::math::approxFloor( fCell); - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = fDate + aActTime.GetTimeInDays(); } break; |