diff options
| author | Eike Rathke <erack@redhat.com> | 2015-12-09 22:28:38 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-12-10 00:04:55 +0100 |
| commit | afa8fec8367c747cbf50d81fe836dd1679b85867 (patch) | |
| tree | 5b29cdd2a1c0155cd187fc4bcc52a6e79dd82658 /sc/source/core | |
| parent | b35bfb9f439910c14dc6161534d66a5a51cb1121 (diff) | |
display as entire col/row also if both anchors relative, tdf#92779
... if not in named expression.
Change-Id: Ie50fedd2303021c925e006d9a8db6ed02321ae5e
(cherry picked from commit a0c4ce340d253d5f197f4e96676225f3f5f216de)
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 05cebc13d384..aa9e1b9bf896 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -822,7 +822,7 @@ struct ConventionOOO_A1 : public Convention_A1 } static SingletonDisplay getSingletonDisplay( const ScAddress& rAbs1, const ScAddress& rAbs2, - const ScComplexRefData& rRef ) + const ScComplexRefData& rRef, bool bFromRangeName ) { // If any part is error, display as such. if (!ValidCol(rAbs1.Col()) || rRef.Ref1.IsColDeleted() || !ValidRow(rAbs1.Row()) || rRef.Ref1.IsRowDeleted() || @@ -833,10 +833,22 @@ struct ConventionOOO_A1 : public Convention_A1 if (rRef.IsEntireCol()) return SINGLETON_COL; + // Same if not in named expression and both rows of entire columns are + // relative references. + if (!bFromRangeName && rAbs1.Row() == 0 && rAbs2.Row() == MAXROW && + rRef.Ref1.IsRowRel() && rRef.Ref2.IsRowRel()) + return SINGLETON_COL; + // 1:1 or $1:$1 or 1:$1 or $1:1 if (rRef.IsEntireRow()) return SINGLETON_ROW; + // Same if not in named expression and both columns of entire rows are + // relative references. + if (!bFromRangeName && rAbs1.Col() == 0 && rAbs2.Col() == MAXCOL && + rRef.Ref1.IsColRel() && rRef.Ref2.IsColRel()) + return SINGLETON_ROW; + return SINGLETON_NONE; } @@ -846,7 +858,7 @@ struct ConventionOOO_A1 : public Convention_A1 const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const override + bool bFromRangeName ) const override { // In case absolute/relative positions weren't separately available: // transform relative to absolute! @@ -854,7 +866,8 @@ struct ConventionOOO_A1 : public Convention_A1 if( !bSingleRef ) aAbs2 = rRef.Ref2.toAbs(rPos); - SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : getSingletonDisplay( aAbs1, aAbs2, rRef); + SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : + getSingletonDisplay( aAbs1, aAbs2, rRef, bFromRangeName); MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, false, eSingleton); if (!bSingleRef) { @@ -1001,7 +1014,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const override + bool bFromRangeName ) const override { rBuffer.append('['); // In case absolute/relative positions weren't separately available: @@ -1019,7 +1032,8 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 } else { - SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : getSingletonDisplay( aAbs1, aAbs2, rRef); + SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE : + getSingletonDisplay( aAbs1, aAbs2, rRef, bFromRangeName); MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1, false, true, eSingleton); if (!bSingleRef) { |