summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 13:29:13 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 19:17:57 +0100
commite994b3fc3b2c9b7d39a715fc4d9453e06434d457 (patch)
tree444fc710a7e31168bba36319f65a862d393c69e6 /reportdesign
parent7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 (diff)
sal_Char->char in remotebridges..sax
Change-Id: I6d32942960a5e997f16eb1301c45495661cd4cea Reviewed-on: https://gerrit.libreoffice.org/85514 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/inc/ReportDefinition.hxx6
-rw-r--r--reportdesign/inc/conditionalexpression.hxx2
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx6
-rw-r--r--reportdesign/source/core/misc/conditionalexpression.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx4
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx6
7 files changed, 14 insertions, 14 deletions
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 436550c9aa3f..9c8c25033e21 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -131,8 +131,8 @@ namespace reportdesign
bool WriteThroughComponent(
/// the component we export
const css::uno::Reference< css::lang::XComponent> & xComponent,
- const sal_Char* pStreamName, /// the stream name
- const sal_Char* pServiceName, /// service name of the component
+ const char* pStreamName, /// the stream name
+ const char* pServiceName, /// service name of the component
/// the argument (XInitialization)
const css::uno::Sequence< css::uno::Any> & rArguments,
/// output descriptor
@@ -144,7 +144,7 @@ namespace reportdesign
bool WriteThroughComponent(
const css::uno::Reference< css::io::XOutputStream> & xOutputStream,
const css::uno::Reference< css::lang::XComponent> & xComponent,
- const sal_Char* pServiceName,
+ const char* pServiceName,
const css::uno::Sequence< css::uno::Any> & rArguments,
const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc);
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index 320506cafb2b..12b84f95ee42 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -38,7 +38,7 @@ namespace rptui
const OUString m_sPattern;
public:
- ConditionalExpression( const sal_Char* _pAsciiPattern );
+ ConditionalExpression( const char* _pAsciiPattern );
/** assembles an expression string from a field data source, and one or two operands
*/
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 296419e4f2db..8fcf9e1b9e3e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1457,8 +1457,8 @@ void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Referen
bool OReportDefinition::WriteThroughComponent(
const uno::Reference<lang::XComponent> & xComponent,
- const sal_Char* pStreamName,
- const sal_Char* pServiceName,
+ const char* pStreamName,
+ const char* pServiceName,
const uno::Sequence<uno::Any> & rArguments,
const uno::Sequence<beans::PropertyValue> & rMediaDesc,
const uno::Reference<embed::XStorage>& _xStorageToSaveTo)
@@ -1504,7 +1504,7 @@ bool OReportDefinition::WriteThroughComponent(
bool OReportDefinition::WriteThroughComponent(
const uno::Reference<io::XOutputStream> & xOutputStream,
const uno::Reference<lang::XComponent> & xComponent,
- const sal_Char* pServiceName,
+ const char* pServiceName,
const uno::Sequence<uno::Any> & rArguments,
const uno::Sequence<beans::PropertyValue> & rMediaDesc)
{
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index dc25d4b50bfc..25ccd140a6d6 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -28,7 +28,7 @@ namespace rptui
// = ConditionalExpression
- ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern )
+ ConditionalExpression::ConditionalExpression( const char* _pAsciiPattern )
:m_sPattern( OUString::createFromAscii( _pAsciiPattern ) )
{
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index b39b315ce13b..0787a313c5d7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -184,8 +184,8 @@ static ErrCode ReadThroughComponent(
static ErrCode ReadThroughComponent(
const uno::Reference< embed::XStorage >& xStorage,
const uno::Reference<XComponent>& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
const uno::Reference<XComponentContext> & rxContext,
const Reference<document::XGraphicStorageHandler> & rxGraphicStorageHandler,
const Reference<document::XEmbeddedObjectResolver>& _xEmbeddedObjectResolver,
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 986bf85df88c..f659099e2b66 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -177,7 +177,7 @@ namespace rptui
const struct
{
- const sal_Char* programmaticName;
+ const char* programmaticName;
const char* uiNameResId;
OString const helpId;
} aCategories[] = {
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index ab52f063f2ca..5f2ea6b38cfc 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -572,7 +572,7 @@ namespace
template< class ATTRIBUTE_TYPE >
- void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
+ void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName,
const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
void (SAL_CALL report::XReportControlFormat::*pSetter)( ATTRIBUTE_TYPE ) )
{
@@ -582,7 +582,7 @@ namespace
}
- void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
+ void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName,
const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) )
{
@@ -592,7 +592,7 @@ namespace
}
- void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
+ void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName,
const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
void (SAL_CALL report::XReportControlFormat::*pSetter)( const lang::Locale& ) )
{