reportdesign/inc/ReportDefinition.hxx | 12 ++++++------
reportdesign/source/core/api/ReportEngineJFree.cxx | 4 ++--
reportdesign/source/core/inc/FixedLine.hxx | 6 +++---
reportdesign/source/core/inc/FixedText.hxx | 16 ++++++++--------
reportdesign/source/core/inc/FormatCondition.hxx | 12 ++++++------
reportdesign/source/core/inc/FormattedField.hxx | 16 ++++++++--------
reportdesign/source/core/inc/Function.hxx | 12 ++++++------
reportdesign/source/core/inc/Group.hxx | 16 ++++++++--------
reportdesign/source/core/inc/ImageControl.hxx | 12 ++++++------
reportdesign/source/core/inc/ReportEngineJFree.hxx | 8 ++++----
reportdesign/source/core/inc/Section.hxx | 16 ++++++++--------
reportdesign/source/core/inc/Shape.hxx | 12 ++++++------
reportdesign/source/filter/xml/xmlFixedContent.cxx | 4 ++--
reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +-
reportdesign/source/filter/xml/xmlReport.cxx | 2 +-
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 4 ++--
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 2 +-
reportdesign/source/filter/xml/xmlSubDocument.cxx | 4 ++--
reportdesign/source/filter/xml/xmlSubDocument.hxx | 2 +-
reportdesign/source/ui/dlg/Navigator.cxx | 4 ++--
reportdesign/source/ui/inc/GeometryHandler.hxx | 8 ++++----
reportdesign/source/ui/inspection/GeometryHandler.cxx | 6 +++---
reportdesign/source/ui/report/ReportController.cxx | 8 ++++----
23 files changed, 94 insertions(+), 94 deletions(-)
New commits:
commit fd2ba0d7cd3598f329bd18f96c0716b68e396378
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 22 09:37:31 2016 +0200
Avoid reserved identifiers
Change-Id: Ifccf58c748ca8189949efeecc1ac7329a07be1f7
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index 542bcb0..e0a4374 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -102,27 +102,27 @@ namespace reportdesign
,css::uno::Reference< css::report::XSection>&
_member);
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx
b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 27f86d7..f566515 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -395,9 +395,9 @@ void SAL_CALL OReportEngineJFree::setActiveConnection(
const uno::Reference< sdb
return m_nMaxRows;
}
-void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 _MaxRows ) throw
(uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 MaxRows ) throw
(uno::RuntimeException, std::exception)
{
- set(PROPERTY_MAXROWS,_MaxRows,m_nMaxRows);
+ set(PROPERTY_MAXROWS,MaxRows,m_nMaxRows);
}
} // namespace reportdesign
diff --git a/reportdesign/source/core/inc/FixedLine.hxx
b/reportdesign/source/core/inc/FixedLine.hxx
index 944055a..7143c34 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -56,14 +56,14 @@ namespace reportdesign
OFixedLine& operator=(const OFixedLine&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/core/inc/FixedText.hxx
b/reportdesign/source/core/inc/FixedText.hxx
index b0cf3c63..f5f5141 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -51,31 +51,31 @@ namespace reportdesign
OFixedText& operator=(const OFixedText&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx
b/reportdesign/source/core/inc/FormatCondition.hxx
index a83aab8..99c3db4 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -49,26 +49,26 @@ namespace reportdesign
OFormatCondition& operator=(const OFormatCondition&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/core/inc/FormattedField.hxx
b/reportdesign/source/core/inc/FormattedField.hxx
index 418eea0..3b0b497 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -54,31 +54,31 @@ namespace reportdesign
OFormattedField& operator=(const OFormattedField&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
diff --git a/reportdesign/source/core/inc/Function.hxx
b/reportdesign/source/core/inc/Function.hxx
index bd45f84..c39378a 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -51,26 +51,26 @@ namespace reportdesign
OFunction& operator=(const OFunction&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/core/inc/Group.hxx
b/reportdesign/source/core/inc/Group.hxx
index e637f22..2232701 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -55,31 +55,31 @@ namespace reportdesign
OGroup(const OGroup&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
diff --git a/reportdesign/source/core/inc/ImageControl.hxx
b/reportdesign/source/core/inc/ImageControl.hxx
index 70b04ca..a80e9d5 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -51,26 +51,26 @@ namespace reportdesign
OImageControl& operator=(const OImageControl&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx
b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 4f32db1..1dee730 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -55,14 +55,14 @@ namespace reportdesign
OReportEngineJFree(const OReportEngineJFree&) = delete;
OReportEngineJFree& operator=(const OReportEngineJFree&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
@@ -111,7 +111,7 @@ namespace reportdesign
virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL
getStatusIndicator() throw (css::uno::RuntimeException, std::exception)
override ;
virtual void SAL_CALL setStatusIndicator( const css::uno::Reference<
css::task::XStatusIndicator >& _statusindicator ) throw
(css::uno::RuntimeException, std::exception) override ;
virtual ::sal_Int32 SAL_CALL getMaxRows() throw
(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMaxRows( ::sal_Int32 _MaxRows ) throw
(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setMaxRows( ::sal_Int32 MaxRows ) throw
(css::uno::RuntimeException, std::exception) override;
// Methods
virtual css::uno::Reference< css::frame::XModel > SAL_CALL
createDocumentModel( ) throw (css::lang::DisposedException,
css::lang::IllegalArgumentException, css::uno::Exception,
css::uno::RuntimeException, std::exception) override ;
virtual css::uno::Reference< css::frame::XModel > SAL_CALL
createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame )
throw (css::lang::DisposedException, css::lang::IllegalArgumentException,
css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
diff --git a/reportdesign/source/core/inc/Section.hxx
b/reportdesign/source/core/inc/Section.hxx
index a42b607..cdda923 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -79,31 +79,31 @@ namespace reportdesign
OSection& operator=(const OSection&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( _member != _Value )
+ if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
}
l.notify();
diff --git a/reportdesign/source/core/inc/Shape.hxx
b/reportdesign/source/core/inc/Shape.hxx
index 745ab5d..4524891 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -60,26 +60,26 @@ namespace reportdesign
OShape& operator=(const OShape&) = delete;
template <typename T> void set( const OUString& _sProperty
- ,const T& _Value
+ ,const T& Value
,T& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
void set( const OUString& _sProperty
- ,bool _Value
+ ,bool Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(_Value), &l);
- _member = _Value;
+ prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ _member = Value;
}
l.notify();
}
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 4546b21..ea87a5d 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -126,12 +126,12 @@ OXMLFixedContent::~OXMLFixedContent()
}
-SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
+SvXMLImportContext* OXMLFixedContent::CreateChildContext_(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext =
OXMLReportElementBase::_CreateChildContext(nPrefix,rLocalName,xAttrList);
+ SvXMLImportContext *pContext =
OXMLReportElementBase::CreateChildContext_(nPrefix,rLocalName,xAttrList);
if ( pContext )
return pContext;
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx
b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 056aef5..ccfe510 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -36,7 +36,7 @@ namespace rptxml
bool m_bFormattedField;
protected:
- virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >
& xAttrList ) override;
private:
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx
b/reportdesign/source/filter/xml/xmlReport.cxx
index aaef945..895ae83 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -131,7 +131,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext =
_CreateChildContext(nPrefix,rLocalName,xAttrList);
+ SvXMLImportContext *pContext =
CreateChildContext_(nPrefix,rLocalName,xAttrList);
if ( pContext )
return pContext;
const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index fb0e830..97c1521 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -52,13 +52,13 @@ SvXMLImportContext*
OXMLReportElementBase::CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext =
_CreateChildContext(nPrefix,rLocalName,xAttrList);
+ SvXMLImportContext *pContext =
CreateChildContext_(nPrefix,rLocalName,xAttrList);
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
return pContext;
}
-SvXMLImportContext* OXMLReportElementBase::_CreateChildContext(
+SvXMLImportContext* OXMLReportElementBase::CreateChildContext_(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index e4afcc6..fd8c5c6 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -46,7 +46,7 @@ namespace rptxml
OXMLTable* m_pContainer;
css::uno::Reference< css::report::XReportComponent > m_xComponent;
- virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >
& xAttrList );
public:
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx
b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 4e27077..3abc7a9 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -57,12 +57,12 @@ OXMLSubDocument::~OXMLSubDocument()
}
-SvXMLImportContext* OXMLSubDocument::_CreateChildContext(
+SvXMLImportContext* OXMLSubDocument::CreateChildContext_(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext =
OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList);
+ SvXMLImportContext *pContext =
OXMLReportElementBase::CreateChildContext_(_nPrefix,_rLocalName,xAttrList);
if ( pContext )
return pContext;
const SvXMLTokenMap& rTokenMap =
static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx
b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index 1bbeb6d..347c44c 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -39,7 +39,7 @@ namespace rptxml
OXMLSubDocument(const OXMLSubDocument&) = delete;
void operator =(const OXMLSubDocument&) = delete;
- virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >
& xAttrList ) override;
public:
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx
b/reportdesign/source/ui/dlg/Navigator.cxx
index d95062c..f8e6364 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -134,7 +134,7 @@ class NavigatorTree : public ::cppu::BaseMutex
// OContainerListener
virtual void _elementInserted( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException, std::exception) override;
- virtual void _elementRemoved( const container::ContainerEvent& _Event )
+ virtual void _elementRemoved( const container::ContainerEvent& Event )
throw (uno::RuntimeException, std::exception) override;
virtual void _elementReplaced( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException, std::exception) override;
virtual void _disposing(const lang::EventObject& _rSource)
@@ -174,7 +174,7 @@ protected:
// OContainerListener Helper
void _elementInserted( const container::ContainerEvent& _rEvent );
- void _elementRemoved( const container::ContainerEvent& _Event );
+ void _elementRemoved( const container::ContainerEvent& Event );
void _elementReplaced( const container::ContainerEvent& _rEvent );
public:
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx
b/reportdesign/source/ui/inc/GeometryHandler.hxx
index da73d23..7512fb0 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -124,10 +124,10 @@ namespace rptui
/** check whether the given function name is a counter function.
*
* \param _sQuotedFunctionName the quoted function name to check
- * \param _Out_sScope the scope of the function
+ * \param Out_sScope the scope of the function
* \return When true it is a counter functions otherwise false.
*/
- bool impl_isCounterFunction_throw(const OUString&
_sQuotedFunctionName,OUString& _Out_sScope) const;
+ bool impl_isCounterFunction_throw(const OUString&
_sQuotedFunctionName,OUString& Out_sScope) const;
/** clear the own properties like function and scope and send a
notification
*
@@ -185,13 +185,13 @@ namespace rptui
/** checks if the given function is a default function we know.
*
* \param _sQuotedFunction the quoted function name
- * \param _Out_rDataField the data field which is used in the function
+ * \param Out_rDataField the data field which is used in the function
* \param _xFunctionsSupplier the function supplier to search or empty
if not used
* \param _bSet If set to sal_True than the m_sDefaultFunction and
m_sScope vars will be set if successful.
* \return sal_True with known otherwise sal_False
*/
bool isDefaultFunction(const OUString& _sQuotedFunction
- ,OUString& _Out_rDataField
+ ,OUString& Out_rDataField
,const css::uno::Reference<
css::report::XFunctionsSupplier>& _xFunctionsSupplier = css::uno::Reference<
css::report::XFunctionsSupplier>()
,bool _bSet = false) const;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 3f6eda8..4bf753a 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -2064,7 +2064,7 @@ void GeometryHandler::impl_initFieldList_nothrow(
uno::Sequence< OUString >& _rF
}
}
-bool GeometryHandler::impl_isCounterFunction_throw(const OUString&
_sQuotedFunctionName,OUString& _Out_sScope) const
+bool GeometryHandler::impl_isCounterFunction_throw(const OUString&
_sQuotedFunctionName,OUString& Out_sScope) const
{
::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind =
m_aFunctionNames.equal_range(_sQuotedFunctionName);
while ( aFind.first != aFind.second )
@@ -2086,10 +2086,10 @@ bool
GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct
if ( xGroup.is() )
{
OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
- _Out_sScope =
sGroupName.replaceFirst("%1",xGroup->getExpression());
+ Out_sScope =
sGroupName.replaceFirst("%1",xGroup->getExpression());
}
else
- _Out_sScope = uno::Reference< report::XReportDefinition
>(aFind.first->second.second,uno::UNO_QUERY_THROW)->getName();
+ Out_sScope = uno::Reference< report::XReportDefinition
>(aFind.first->second.second,uno::UNO_QUERY_THROW)->getName();
break;
}
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 4da889d..5d4b0a2 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3112,14 +3112,14 @@ Any SAL_CALL OReportController::getSelection( ) throw
(RuntimeException, std::e
return aRet;
}
-void SAL_CALL OReportController::addSelectionChangeListener( const Reference<
view::XSelectionChangeListener >& _Listener ) throw (RuntimeException,
std::exception)
+void SAL_CALL OReportController::addSelectionChangeListener( const Reference<
view::XSelectionChangeListener >& Listener ) throw (RuntimeException,
std::exception)
{
- m_aSelectionListeners.addInterface( _Listener );
+ m_aSelectionListeners.addInterface( Listener );
}
-void SAL_CALL OReportController::removeSelectionChangeListener( const
Reference< view::XSelectionChangeListener >& _Listener ) throw
(RuntimeException, std::exception)
+void SAL_CALL OReportController::removeSelectionChangeListener( const
Reference< view::XSelectionChangeListener >& Listener ) throw
(RuntimeException, std::exception)
{
- m_aSelectionListeners.removeInterface( _Listener );
+ m_aSelectionListeners.removeInterface( Listener );
}
void OReportController::createNewFunction(const uno::Any& _aValue)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
