[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source
Mike Kaganski
mike.kaganski at collabora.com
Tue Jun 28 13:12:36 UTC 2016
include/svx/svdmodel.hxx | 2 +-
sc/source/ui/inc/viewdata.hxx | 3 ++-
sc/source/ui/view/prevwsh.cxx | 4 ++--
sc/source/ui/view/viewdata.cxx | 8 ++++----
sd/source/ui/view/drviews5.cxx | 2 +-
svx/source/svdraw/svdmodel.cxx | 3 ++-
sw/source/uibase/uiview/view.cxx | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit c9f05625a7d34bed2229d59466420cd56f904c41
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Tue Jun 28 21:23:31 2016 +1000
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 at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 1c8f3cf..fa24d55 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -552,7 +552,7 @@ public:
// Used as a fallback in *::ReadUserDataSequence() to process common properties
void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
- static void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool bBrowse = false);
+ 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 */
virtual SvxNumType GetPageNumType() const;
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 789bdf2..6657e83 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 10af8bb..a2a36f8 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 37234a8..d188643 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)
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3aeb12c..b4e3319 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
- SdrModel::WriteUserDataSequence(rSequence, bBrowse);
+ GetDocSh()->GetDoc()->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 0b051f6..5c66289 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1933,7 +1933,8 @@ void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* /*pVal
void SdrModel::WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool /*bBrowse*/)
{
std::vector< std::pair< OUString, Any > > aUserData;
- // TODO: addPair(aUserData, "PropName", PropValue);
+ (void) this;
+ // TODO: Write common model-level properties (e.g. to settings.xml)
const sal_Int32 nOldLength = rValues.getLength();
rValues.realloc(nOldLength + aUserData.size());
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 2b1bdbb..7821da5 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
- SdrModel::WriteUserDataSequence(rSequence);
+ GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->WriteUserDataSequence(rSequence);
}
void SwView::ShowCursor( bool bOn )
More information about the Libreoffice-commits
mailing list