diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-06-28 21:23:31 +1000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-28 13:12:09 +0000 |
| commit | c9f05625a7d34bed2229d59466420cd56f904c41 (patch) | |
| tree | 75e06564b32d9d4ad6c334dc6abfcd603ee56a6a /sc | |
| parent | 442dd6a153385d7c2826eabe0737d4d53332f392 (diff) | |
Revert c7b9b9204ce2b3c1e0dbc0d79e4e01d27ad2ac7e
Also make changes to make loplugin:staticmethods happy
Change-Id: Ia55d063c0fa5a1d9392e09f23ebb1266f46745b9
Reviewed-on: https://gerrit.libreoffice.org/26740
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 789bdf263cf8..6657e83dfd07 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -144,7 +144,8 @@ private: ScViewDataTable(); void WriteUserDataSequence( - css::uno::Sequence <css::beans::PropertyValue>& rSettings ) const; + css::uno::Sequence <css::beans::PropertyValue>& rSettings, + const ScViewData& rViewData, SCTAB nTab ) const; void ReadUserDataSequence( const css::uno::Sequence <css::beans::PropertyValue>& rSettings, diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 10af8bb5e108..a2a36f81a2cc 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -949,7 +949,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue } // Common SdrModel processing - SdrModel::WriteUserDataSequence(rSeq); + GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq); } void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq) @@ -977,7 +977,7 @@ void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyV } // Fallback to common SdrModel processing else GetDocument().GetDrawLayer()->ReadUserDataSequenceValue(pSeq); - } + } } } } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 37234a8f5d03..d188643b660c 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -112,7 +112,7 @@ ScViewDataTable::~ScViewDataTable() { } -void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings) const +void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings, const ScViewData& rViewData, SCTAB /*nTab*/) const { rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT); beans::PropertyValue* pSettings = rSettings.getArray(); @@ -161,7 +161,7 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue> } // Common SdrModel processing - SdrModel::WriteUserDataSequence(rSettings); + rViewData.GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings); } void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>& aSettings, ScViewData& rViewData, SCTAB nTab, bool& rHasZoom ) @@ -2655,7 +2655,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe if (maTabData[nTab]) { uno::Sequence <beans::PropertyValue> aTableViewSettings; - maTabData[nTab]->WriteUserDataSequence(aTableViewSettings); + maTabData[nTab]->WriteUserDataSequence(aTableViewSettings, *this, nTab); OUString sTabName; GetDocument()->GetName( nTab, sTabName ); try @@ -2735,7 +2735,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe } // Common SdrModel processing - SdrModel::WriteUserDataSequence(rSettings); + GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings); } void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>& rSettings) |