diff options
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviews5.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e8de6d0e4daf..1c8f3cfea890 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -551,7 +551,7 @@ public: bool IsWriter() const { return !bMyPool; } // Used as a fallback in *::ReadUserDataSequence() to process common properties - static void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue); + void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue); static void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool bBrowse = false); /** returns the numbering type that is used to format page fields in drawing shapes */ diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6657e83dfd07..789bdf263cf8 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -144,8 +144,7 @@ private: ScViewDataTable(); void WriteUserDataSequence( - css::uno::Sequence <css::beans::PropertyValue>& rSettings, - const ScViewData& rViewData, SCTAB nTab ) const; + css::uno::Sequence <css::beans::PropertyValue>& rSettings ) 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 b363f7c65d62..10af8bb5e108 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 - GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq); + SdrModel::WriteUserDataSequence(rSeq); } void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d188643b660c..37234a8f5d03 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 ScViewData& rViewData, SCTAB /*nTab*/) const +void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings) 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 - rViewData.GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings); + SdrModel::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, *this, nTab); + maTabData[nTab]->WriteUserDataSequence(aTableViewSettings); OUString sTabName; GetDocument()->GetName( nTab, sTabName ); try @@ -2735,7 +2735,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe } // Common SdrModel processing - GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings); + SdrModel::WriteUserDataSequence(rSettings); } void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>& rSettings) diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index b4e331918038..3aeb12c03530 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -454,7 +454,7 @@ void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Pro rSequence[nIndex].Value <<= mbZoomOnPage; // Common SdrModel processing - GetDocSh()->GetDoc()->WriteUserDataSequence(rSequence, bBrowse); + SdrModel::WriteUserDataSequence(rSequence, bBrowse); } void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index bc0af3a20a65..0b051f6cce18 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1927,7 +1927,7 @@ SvxNumType SdrModel::GetPageNumType() const void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* /*pValue*/) { - // TODO: Read common model-level values + (void) this; // TODO: Read common model-level values } void SdrModel::WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool /*bBrowse*/) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 7821da5e39c4..2b1bdbbb84cf 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1494,7 +1494,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe rSequence = comphelper::containerToSequence(aVector); // Common SdrModel processing - GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->WriteUserDataSequence(rSequence); + SdrModel::WriteUserDataSequence(rSequence); } void SwView::ShowCursor( bool bOn ) |