diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-03-09 15:23:11 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-12 00:21:29 +0000 |
| commit | 51d0b4037b36a4a74c9181b95edb18017542ab79 (patch) | |
| tree | c13c5ac4782888e1640ee60911d68329018dcc05 /sc/source/filter/oox/worksheethelper.cxx | |
| parent | dc519b6dea7653e4b68b45aa664e3c0b5189d682 (diff) | |
tdf#84938 Change defines to typed_flags
Put defines into an enum class and use typed_flags template from o3tl
to give them flag operators.
There were some shift operations to apply flags from start references
to end references, these went into a helper in address.hxx to hide
them. A marco with shift operations in address.cxx was rewritten in two
helpers without shifts.
One shift remained in ScRange::Format with a comment.
The other flag untypical operator was a minus 1 in a helper for
ScRefFinder::ToggleRel, which iteratates through all possible
combinations for absolute references. This is used to make referecnces
absolute via SHIFT+F4. A replacement would be too complex.
Change-Id: I4850f1623e01e56c60ac2260b95fc5cad8b6fd71
Signed-off-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-on: https://gerrit.libreoffice.org/22840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/filter/oox/worksheethelper.cxx')
| -rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 1f8b670bc251..fa0efef957ab 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1029,7 +1029,8 @@ OUString WorksheetGlobals::getHyperlinkUrl( const HyperlinkModel& rHyperlink ) c { ScRange aRange; if ((aRange.ParseAny( aUrl.copy( nSepPos + 1 ), nullptr, - formula::FormulaGrammar::CONV_XL_R1C1) & SCA_VALID) != SCA_VALID) + formula::FormulaGrammar::CONV_XL_R1C1) + & ScRefFlags::VALID) == ScRefFlags::ZERO) aUrl = aUrl.replaceAt( nSepPos, 1, OUString( '.' ) ); } // #i66592# convert sheet names that have been renamed on import |