diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-06-19 20:46:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-06-19 22:56:19 +0200 |
| commit | f5f946e707cb8beda0e4ae790aa65abbf61b3083 (patch) | |
| tree | f1369a3b150cfb7d79550d4473f7593b7927db68 /sw/source/filter/inc | |
| parent | 352284e77f905bc5f09c1dfdab35059e0a3de6bf (diff) | |
ofz#47706 Timeout
2m34s->1.6s
Change-Id: I2370237e07d6e2a45c831c70ac1c1158efef7816
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136107
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/inc')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index b2696c2d7ddc..1a3626bdd521 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -162,6 +162,10 @@ namespace sw in knowing if the style has either a builtin standard id, or is a user defined style. + @param rCollisions + Cache of previous name collisions to speed up resolution + of later duplicates. + @return The equivalent writer style packaged as a StyleResult to use for this word style. @@ -171,7 +175,8 @@ namespace sw rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely and impossible. */ - StyleResult GetStyle(const OUString& rName, ww::sti eSti); + StyleResult GetStyle(const OUString& rName, ww::sti eSti, + std::map<OUString, sal_Int32>& rCollisions); }; /** Knows which writer style a given word style should be imported as @@ -219,6 +224,10 @@ namespace sw in knowing if the style has either a builtin standard id, or is a user defined style. + @param rCollisions + Cache of previous name collisions to speed up resolution + of later duplicates. + @return The equivalent writer style packaged as a StyleResult to use for this word style. @@ -228,7 +237,8 @@ namespace sw rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely and impossible. */ - StyleResult GetStyle(const OUString& rName, ww::sti eSti); + StyleResult GetStyle(const OUString& rName, ww::sti eSti, + std::map<OUString, sal_Int32>& rCollisions); }; /** Find suitable names for exporting this font |