[Libreoffice-commits] core.git: include/sfx2 sc/inc sc/source sfx2/source sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Feb 22 17:01:56 UTC 2019
include/sfx2/progress.hxx | 1 -
sc/inc/globstr.hrc | 1 -
sc/inc/progress.hxx | 9 ---------
sc/source/ui/docshell/dbdocimp.cxx | 7 +------
sfx2/source/bastyp/progress.cxx | 11 -----------
sw/inc/mdiexp.hxx | 1 -
sw/source/core/edit/edtox.cxx | 2 --
sw/source/uibase/app/mainwn.cxx | 10 ----------
8 files changed, 1 insertion(+), 41 deletions(-)
New commits:
commit f47b60667ff307e9e44ecd5457261151b9aca8cb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 12:13:30 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 22 18:01:25 2019 +0100
SfxProgress:SetStateText is dead
since
commit 83ee1bccf9899bb5c1913389b9a26a73a515ad82
Date: Fri Jul 22 09:19:52 2011 +0100
callcatcher: remove unused methods
and even following the history back before that only shows one previous
actual place where the state text was being displayed.
Change-Id: Ib520cb6e999c1e11caf7348821bb274cdd785a44
Reviewed-on: https://gerrit.libreoffice.org/68198
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 10b9de3f22ec..2a62bf6da44c 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -47,7 +47,6 @@ public:
bool bWait = true);
virtual ~SfxProgress();
- void SetStateText( sal_uInt32 nVal, const OUString &rVal );
void SetState( sal_uInt32 nVal, sal_uInt32 nNewRange = 0 );
sal_uInt32 GetState() const { return nVal; }
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index dbdcd6676d99..614beb5300bb 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -125,7 +125,6 @@
#define STR_MSSG_REPEATDB_0 NC_("STR_MSSG_REPEATDB_0", "No operations to execute")
#define STR_MSSG_MAKEAUTOFILTER_0 NC_("STR_MSSG_MAKEAUTOFILTER_0", "The range does not contain column headers.\nDo you want the first line to be used as column header?")
#define STR_MSSG_IMPORTDATA_0 NC_("STR_MSSG_IMPORTDATA_0", "Error while importing data!")
-#define STR_PROGRESS_IMPORT NC_("STR_PROGRESS_IMPORT", "# records imported...")
#define STR_MSSG_MAKEOUTLINE_0 NC_("STR_MSSG_MAKEOUTLINE_0", "Grouping not possible")
#define STR_MSSG_REMOVEOUTLINE_0 NC_("STR_MSSG_REMOVEOUTLINE_0", "Ungrouping not possible")
#define STR_MSSG_PASTEFROMCLIP_0 NC_("STR_MSSG_PASTEFROMCLIP_0", "Insert into multiple selection not possible")
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index c8fb59646e58..7df88df6328c 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -76,15 +76,6 @@ public:
/// for DummyInterpret only, never use otherwise!!!
ScProgress();
#endif
-
- void SetStateText( sal_uLong nVal, const OUString &rVal )
- {
- if ( pProgress )
- {
- CalcGlobalPercent( nVal );
- pProgress->SetStateText( nVal, rVal );
- }
- }
void SetState( sal_uLong nVal, sal_uLong nNewRange = 0 )
{
if ( pProgress )
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 56cc78aa9cfb..73c1e00de8a3 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -342,12 +342,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
++nInserted;
if (!(nInserted & 15))
{
- OUString aPict = ScResId( STR_PROGRESS_IMPORT );
- OUString aText = aPict.getToken(0, '#')
- + OUString::number( nInserted )
- + aPict.getToken(1, '#');
-
- aProgress.SetStateText( 0, aText );
+ aProgress.SetState( 0 );
}
}
else // past the end of the spreadsheet
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index a1eb0394c1ec..ca06be5bad95 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -170,17 +170,6 @@ void SfxProgress::Stop()
SfxGetpApp()->SetProgress_Impl(nullptr);
}
-void SfxProgress::SetStateText
-(
- sal_uInt32 nNewVal, /* New value for the progress-bar */
- const OUString& rNewVal /* Status as Text */
-)
-
-{
- pImpl->aStateText = rNewVal;
- SetState( nNewVal );
-}
-
void SfxProgress::SetState
(
sal_uInt32 nNewVal, /* new value for the progress bar */
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 052385911da5..3715c6702f78 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -44,7 +44,6 @@ extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
SW_DLLPUBLIC void StartProgress(const char* pMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr);
SW_DLLPUBLIC void EndProgress ( SwDocShell const *pDocSh );
SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell const *pDocShell );
-void SetProgressText(const char* pMessId, SwDocShell const *pDocShell);
void RescheduleProgress( SwDocShell const *pDocShell );
void RepaintPagePreview( SwViewShell const * pVwSh, const SwRect& rRect );
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index d7b71d352820..ae13d140ecc3 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -133,7 +133,6 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
SwDocShell* pDocSh = GetDoc()->GetDocShell();
::StartProgress( STR_STATSTR_TOX_INSERT, 0, 0, pDocSh );
- ::SetProgressText( STR_STATSTR_TOX_INSERT, pDocSh );
// Insert listing
const SwTOXBaseSection* pTOX = mxDoc->InsertTableOf(
@@ -169,7 +168,6 @@ void SwEditShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
StartAllAction();
::StartProgress( STR_STATSTR_TOX_UPDATE, 0, 0, pDocSh );
- ::SetProgressText( STR_STATSTR_TOX_UPDATE, pDocSh );
pMyDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::TOXCHANGE, nullptr);
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index 8adb6212e4ad..a367b81eef18 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -116,16 +116,6 @@ void EndProgress( SwDocShell const *pDocShell )
}
}
-void SetProgressText(const char* pId, SwDocShell const *pDocShell)
-{
- if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
- {
- SwProgress *pProgress = lcl_SwFindProgress( pDocShell );
- if ( pProgress )
- pProgress->pProgress->SetStateText(0, SwResId(pId));
- }
-}
-
void RescheduleProgress( SwDocShell const *pDocShell )
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
More information about the Libreoffice-commits
mailing list