sd/source/ui/func/fupage.cxx
| 18 +++---
sd/source/ui/inc/fupage.hxx
| 3 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
| 28 +++++-----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
| 26 +++++----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
| 26 +++++----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
| 26 +++++----
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
| 28 +++++-----
7 files changed, 89 insertions(+), 66 deletions(-)
New commits:
commit dae592f7741b29898d384e09369956512eed183b
Author: Caolán McNamara <[email protected]>
AuthorDate: Thu Aug 8 21:25:22 2024 +0100
Commit: Caolán McNamara <[email protected]>
CommitDate: Fri Aug 9 10:53:08 2024 +0200
cid#1616089 COPY_INSTEAD_OF_MOVE
and
cid#1616088 COPY_INSTEAD_OF_MOVE
Change-Id: I9af46a95aadb7574a32e0542b7e4ed4a8495da5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171651
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Jenkins
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index f8b8fad5b0ba..3ecbfd2ebe90 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -350,7 +350,8 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent,
const SfxRequest& rReq)
VclPtr<SfxAbstractTabDialog> xDlg(
pFact->CreateSdTabPageDialog(mpViewShell->GetFrameWeld(),
aMergedAttr.get(), mpDocSh,
mbDisplayBackgroundTabPage, bIsImpressDoc) );
rtl::Reference<FuPage> xThis( this ); // avoid destruction within
async processing
- xDlg->StartExecuteAsync([xDlg, xThis, pStyleSheet, aNewAttr,
aMergedAttr](sal_Int32 nResult) {
+ xDlg->StartExecuteAsync([xDlg, xThis, pStyleSheet,
aNewAttr=std::move(aNewAttr),
+ aMergedAttr=std::move(aMergedAttr)](sal_Int32
nResult) {
if (nResult == RET_OK && pStyleSheet) {
SfxItemSet tempSet(*xDlg->GetOutputItemSet());
xThis->ApplyItemSet(*pStyleSheet, aNewAttr, tempSet,
aMergedAttr);
@@ -361,7 +362,8 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent,
const SfxRequest& rReq)
}
}
-void FuPage::ApplyItemSet(SdStyleSheet& styleSheet,
std::shared_ptr<SfxItemSet> aNewAttr, SfxItemSet& tempSet,
std::shared_ptr<SfxItemSet> aMergedAttr) {
+void FuPage::ApplyItemSet(SdStyleSheet& styleSheet, const
std::shared_ptr<SfxItemSet>& newAttr,
+ SfxItemSet& tempSet, const
std::shared_ptr<SfxItemSet>& mergedAttr) {
styleSheet.AdjustToFontHeight(tempSet);
if( mbDisplayBackgroundTabPage )
@@ -371,12 +373,12 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet,
std::shared_ptr<SfxItemSet>
bool bChanges = false;
for( sal_uInt16 i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ )
{
- if( aMergedAttr->GetItemState( i ) != SfxItemState::DEFAULT )
+ if( mergedAttr->GetItemState( i ) != SfxItemState::DEFAULT )
{
if( tempSet.GetItemState( i ) == SfxItemState::DEFAULT )
- tempSet.Put( aMergedAttr->Get( i ) );
+ tempSet.Put( mergedAttr->Get( i ) );
else {
- if( !SfxPoolItem::areSame(aMergedAttr->GetItem( i ),
tempSet.GetItem( i ) ) ) {
+ if( !SfxPoolItem::areSame(mergedAttr->GetItem( i ),
tempSet.GetItem( i ) ) ) {
bChanges = true;
}
}
@@ -392,7 +394,7 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet,
std::shared_ptr<SfxItemSet>
{
if (tempSet.GetItemState(XATTR_FILLSTYLE) == SfxItemState::DEFAULT)
{
- const XFillStyleItem* pMergedFillStyleItem =
aMergedAttr->GetItem<XFillStyleItem>(XATTR_FILLSTYLE);
+ const XFillStyleItem* pMergedFillStyleItem =
mergedAttr->GetItem<XFillStyleItem>(XATTR_FILLSTYLE);
assert(pMergedFillStyleItem);
if (pMergedFillStyleItem->GetValue() ==
drawing::FillStyle_NONE)
mbPageBckgrdDeleted = true;
@@ -475,8 +477,8 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet,
std::shared_ptr<SfxItemSet>
"MasterPage without StyleSheet detected (!)");
}
- aNewAttr->Put( tempSet );
- ApplyItemSet( aNewAttr.get() );
+ newAttr->Put( tempSet );
+ ApplyItemSet( newAttr.get() );
}
void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index 3dd2598cea9b..23e8f9e2da68 100644
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -55,7 +55,8 @@ private:
SdDrawDocument* pDoc,
SfxRequest& rReq );
- void ApplyItemSet( SdStyleSheet& styleSheet, std::shared_ptr<SfxItemSet>
aNewAttr, SfxItemSet& tempSet, std::shared_ptr<SfxItemSet> aMergedAttr);
+ void ApplyItemSet(SdStyleSheet& styleSheet, const
std::shared_ptr<SfxItemSet>& newAttr,
+ SfxItemSet& tempSet, const std::shared_ptr<SfxItemSet>&
rMergedAttr);
void ApplyItemSet( const SfxItemSet* pArgs );
std::unique_ptr<SdBackgroundObjUndoAction>
commit fb443c4f8e218dadc9c8d0c85ef61cf4be8f71ef
Author: Caolán McNamara <[email protected]>
AuthorDate: Tue Aug 6 19:49:53 2024 +0100
Commit: Caolán McNamara <[email protected]>
CommitDate: Fri Aug 9 10:52:57 2024 +0200
cid#1616070 XML external entity processing enabled
reformat to get it seen by scanner
Change-Id: I9b9a40078e6474d87f4fe7cc6b19992023e24144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171652
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Jenkins
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 5877b99d3de9..c49b6560f192 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -47,18 +47,22 @@ public class DOMDocument
private static DocumentBuilderFactory makeFactory() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- String[] featuresToDisable = {
- "http://xml.org/sax/features/external-general-entities";,
- "http://xml.org/sax/features/external-parameter-entities";,
- "http://apache.org/xml/features/nonvalidating/load-external-dtd";
- };
-
- for (String feature : featuresToDisable) {
- try {
- factory.setFeature(feature, false);
- } catch (ParserConfigurationException e) {
- Debug.log(Debug.ERROR, "Exception when calling setFeature: ",
e);
- }
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
}
try {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index 49695e173da3..1fd074cccd5d 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -62,18 +62,22 @@ public abstract class OfficeDocument
private static DocumentBuilderFactory makeFactory() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- String[] featuresToDisable = {
- "http://xml.org/sax/features/external-general-entities";,
- "http://xml.org/sax/features/external-parameter-entities";,
- "http://apache.org/xml/features/nonvalidating/load-external-dtd";
- };
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
- for (String feature : featuresToDisable) {
- try {
- factory.setFeature(feature, false);
- } catch (ParserConfigurationException e) {
- Debug.log(Debug.ERROR, "Exception when calling setFeature: ",
e);
- }
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
}
try {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index d88d1f35c10b..ebca456a462b 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -62,18 +62,22 @@ public final class DocumentDeserializerImpl
private static DocumentBuilderFactory makeFactory() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- String[] featuresToDisable = {
- "http://xml.org/sax/features/external-general-entities";,
- "http://xml.org/sax/features/external-parameter-entities";,
- "http://apache.org/xml/features/nonvalidating/load-external-dtd";
- };
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
- for (String feature : featuresToDisable) {
- try {
- factory.setFeature(feature, false);
- } catch (ParserConfigurationException e) {
- Debug.log(Debug.ERROR, "Exception when calling setFeature: ",
e);
- }
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
}
try {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 4d7e42b655fa..a47869ddfb92 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -72,18 +72,22 @@ public final class DocumentSerializerImpl
private static DocumentBuilderFactory makeFactory() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- String[] featuresToDisable = {
- "http://xml.org/sax/features/external-general-entities";,
- "http://xml.org/sax/features/external-parameter-entities";,
- "http://apache.org/xml/features/nonvalidating/load-external-dtd";
- };
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
- for (String feature : featuresToDisable) {
- try {
- factory.setFeature(feature, false);
- } catch (ParserConfigurationException e) {
- Debug.log(Debug.ERROR, "Exception when calling setFeature: ",
e);
- }
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
}
try {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index baf71820bd51..06f4d6239012 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -54,18 +54,22 @@ public class ConverterInfoReader {
private static DocumentBuilderFactory makeFactory() {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- String[] featuresToDisable = {
- "http://xml.org/sax/features/external-general-entities";,
- "http://xml.org/sax/features/external-parameter-entities";,
- "http://apache.org/xml/features/nonvalidating/load-external-dtd";
- };
-
- for (String feature : featuresToDisable) {
- try {
- factory.setFeature(feature, false);
- } catch (ParserConfigurationException e) {
- Debug.log(Debug.ERROR, "Exception when calling setFeature: ",
e);
- }
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
+ }
+
+ try {
+
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
+ } catch (ParserConfigurationException e) {
+ Debug.log(Debug.ERROR, "Exception when calling setFeature: ", e);
}
try {
