[Libreoffice-commits] core.git: reportdesign/source sc/source sw/source
Noel Grandin
noel at peralex.com
Mon Oct 19 00:00:28 PDT 2015
reportdesign/source/filter/xml/xmlFixedContent.cxx | 16 ++++++++--------
reportdesign/source/filter/xml/xmlFormattedField.cxx | 2 +-
reportdesign/source/filter/xml/xmlReport.hxx | 1 +
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 2 +-
sc/source/ui/vba/vbaformat.cxx | 12 +-----------
sc/source/ui/vba/vbastyle.cxx | 13 ++-----------
sc/source/ui/vba/vbastyle.hxx | 1 +
sw/source/filter/ww8/wrtw8nds.cxx | 3 ++-
sw/source/filter/ww8/wrtww8.cxx | 1 +
sw/source/filter/ww8/wrtww8.hxx | 1 +
10 files changed, 19 insertions(+), 33 deletions(-)
New commits:
commit ebd6fec73bfd77aa78a1ae92256d59d04ba999f3
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 19 09:00:04 2015 +0200
Revert "cppcheck:duplInheritedMember"
This reverts commit a55496a9e88ac3da821b0ae0d334866d669540c6.
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 757a4f0..c18edf5 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement()
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
xControl->setDataField("rpt:" + m_sPageText);
- OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
- m_pInP->m_xReportComponent = xControl.get();
- m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+ m_pInP->m_xComponent = xControl.get();
+ m_xComponent = xControl.get();
}
else
{
Reference< XFixedText > xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
- OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
- m_pInP->m_xReportComponent = xControl.get();
- m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+ m_pInP->m_xComponent = xControl.get();
+ m_xComponent = xControl.get();
xControl->setLabel(m_sLabel);
}
- m_pContainer->addCell(m_xReportComponent);
- m_rCell.setComponent(m_xReportComponent);
+ m_pContainer->addCell(m_xComponent);
+ m_rCell.setComponent(m_xComponent);
OXMLReportElementBase::EndElement();
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index b244cb8..47053d3 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
,bool _bPageCount) :
OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer)
{
- OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
+ OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index 13aa3cd..0a94525 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,6 +27,7 @@ namespace rptxml
class ORptFilter;
class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
{
+ ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent;
::std::vector< OUString> m_aMasterFields;
::std::vector< OUString> m_aDetailFields;
OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index ec14b63..c087dbd 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -44,7 +44,7 @@ namespace rptxml
protected:
ORptFilter& m_rImport;
OXMLTable* m_pContainer;
- ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xReportComponent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent;
virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 1896a12..42aaa8f 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -50,17 +50,7 @@ using namespace ::com::sun::star;
#define LOCALE "Locale"
template< typename... Ifc >
-ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const uno::Reference< beans::XPropertySet >& _xPropertySet,
- const uno::Reference< frame::XModel >& xModel,
- bool bCheckAmbiguoity ) throw ( script::BasicErrorException )
- : ScVbaFormat_BASE( xParent, xContext ),
- m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ),
- mxPropertySet( _xPropertySet ),
- mxModel( xModel ),
- mbCheckAmbiguoity( bCheckAmbiguoity ),
- mbAddIndent( false )
+ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( false )
{
try
{
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 6c96083..15f7b90 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -57,11 +57,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE
}
-ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel )
- throw ( script::BasicErrorException, uno::RuntimeException )
- : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
+ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
{
try
{
@@ -73,12 +69,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
}
}
-ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const uno::Reference< beans::XPropertySet >& _xPropertySet,
- const uno::Reference< frame::XModel >& _xModel )
- throw ( script::BasicErrorException, uno::RuntimeException )
- : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
+ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ), mxModel( _xModel )
{
try
{
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index efeed19..0e5ea95 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -32,6 +32,7 @@ class ScVbaStyle : public ScVbaStyle_BASE
{
protected:
css::uno::Reference< css::style::XStyle > mxStyle;
+ css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer;
void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException );
public:
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 66dfe4f..f3da842 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3068,7 +3068,8 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode )
case ND_TEXTNODE:
{
const SwTextNode& rTextNode = *rNode.GetTextNode();
- OutputTextNode( rTextNode );
+ if( !m_bOutOutlineOnly || rTextNode.IsOutline() )
+ OutputTextNode( rTextNode );
}
break;
case ND_GRFNODE:
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 588dc5f..8bd3e1d 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3395,6 +3395,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
, m_bTabInTOC(false)
, m_bHideTabLeaderAndPageNumbers(false)
, m_bExportModeRTF(false)
+ , m_bOutOutlineOnly(false)
, m_bFontSizeWritten(false)
, m_pDoc(pDocument)
, m_nCurStart(pCurrentPam->GetPoint()->nNode.GetIndex())
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index ea1e06f..3638e69 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -555,6 +555,7 @@ public:
bool m_bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
bool m_bExportModeRTF;
+ bool m_bOutOutlineOnly; // export outline nodes, only (send outline to clipboard/presentation)
/// Is font size written already as part of the current character properties?
bool m_bFontSizeWritten;
More information about the Libreoffice-commits
mailing list