diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2023-05-08 22:13:31 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2023-05-08 22:14:10 +0200 |
| commit | c825abdee67b6dc9fce2457a15f08ea9a506fc11 (patch) | |
| tree | be2568b6b270f34e78840e6a6703ddec7ed3438e /sw/source/uibase | |
| parent | ef950b8f42c0c6e501540ffc74ba193f1952b864 (diff) | |
Revert "Simplify initialization in sw/unotxdoc + flatten a bit"
This reverts commit 76a3c01c3abd01f404f8f5ac572e52b2f8a2927e.
Reason for revert: I was wrong, see Mike’s comment
Change-Id: I9c9501e4011f396a2fb726a17aa6f238413a9073
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151517
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 8fff673fdda0..b57cea597759 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -931,27 +931,36 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings() { SolarMutexGuard aGuard; + Sequence< beans::PropertyValue > aSeq(9); if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); + beans::PropertyValue* pArray = aSeq.getArray(); SwPagePreviewPrtData aData; const SwPagePreviewPrtData* pData = m_pDocShell->GetDoc()->GetPreviewPrtData(); - if (!pData) - return {}; - - aData = *pData; - return - { - beans::PropertyValue("PageRows", -1, Any(aData.GetRow()), PropertyState_DIRECT_VALUE), - beans::PropertyValue("PageColumns", -1, Any(aData.GetCol()), PropertyState_DIRECT_VALUE), - beans::PropertyValue("LeftMargin", -1, Any(convertTwipToMm100(aData.GetLeftSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("RightMargin", -1, Any(convertTwipToMm100(aData.GetRightSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("TopMargin", -1, Any(convertTwipToMm100(aData.GetTopSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("BottomMargin", -1, Any(convertTwipToMm100(aData.GetBottomSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("HoriMargin", -1, Any(convertTwipToMm100(aData.GetHorzSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("VertMargin", -1, Any(convertTwipToMm100(aData.GetVertSpace())), PropertyState_DIRECT_VALUE), - beans::PropertyValue("IsLandscape", -1, Any(aData.GetLandscape()), PropertyState_DIRECT_VALUE) - }; + if(pData) + aData = *pData; + Any aVal; + aVal <<= aData.GetRow(); + pArray[0] = beans::PropertyValue("PageRows", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= aData.GetCol(); + pArray[1] = beans::PropertyValue("PageColumns", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetLeftSpace())); + pArray[2] = beans::PropertyValue("LeftMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetRightSpace())); + pArray[3] = beans::PropertyValue("RightMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetTopSpace())); + pArray[4] = beans::PropertyValue("TopMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetBottomSpace())); + pArray[5] = beans::PropertyValue("BottomMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetHorzSpace())); + pArray[6] = beans::PropertyValue("HoriMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetVertSpace())); + pArray[7] = beans::PropertyValue("VertMargin", -1, aVal, PropertyState_DIRECT_VALUE); + aVal <<= aData.GetLandscape(); + pArray[8] = beans::PropertyValue("IsLandscape", -1, aVal, PropertyState_DIRECT_VALUE); + + return aSeq; } static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, bool& bException) |