summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 09:31:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 09:33:33 +0100
commit02b24d77476f93887691dde564351d6f8b770b8f (patch)
treeba741033cd4b00996b370d23443bede3a41a7f88 /forms
parentfd8f926b0e409d49d235409daaf8f7aa8532cc40 (diff)
sal_Char->char in forms..framework
Change-Id: I756c1f54d50403aa9b4f03dbbc2a387556f07084 Reviewed-on: https://gerrit.libreoffice.org/85475 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/helper/controlfeatureinterception.cxx2
-rw-r--r--forms/source/helper/formnavigation.cxx6
-rw-r--r--forms/source/helper/urltransformer.cxx4
-rw-r--r--forms/source/inc/controlfeatureinterception.hxx2
-rw-r--r--forms/source/inc/featuredispatcher.hxx2
-rw-r--r--forms/source/inc/formnavigation.hxx2
-rw-r--r--forms/source/inc/urltransformer.hxx4
-rw-r--r--forms/source/misc/limitedformats.cxx6
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx6
-rw-r--r--forms/source/solar/control/navtoolbar.cxx2
-rw-r--r--forms/source/xforms/computedexpression.cxx2
-rw-r--r--forms/source/xforms/computedexpression.hxx2
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.cxx4
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.hxx2
15 files changed, 24 insertions, 24 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 3bd03fce0b03..5ffb57f11678 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -933,7 +933,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rN
pChild->SetContentDisposition(aContentDisp);
rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
- const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
+ const char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
OUString aBestMatchingEncoding = OUString::createFromAscii(pBestMatchingEncoding);
pChild->SetContentType(
"text/plain; charset=\"" + aBestMatchingEncoding + "\"");
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 16fa4154935d..1e0d0fbcd03d 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -135,7 +135,7 @@ namespace frm
}
- Reference< XDispatch > ControlFeatureInterception::queryDispatch( const sal_Char* _pAsciiURL )
+ Reference< XDispatch > ControlFeatureInterception::queryDispatch( const char* _pAsciiURL )
{
return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) );
}
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 7c7186e11905..96e2b6b8e935 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -264,7 +264,7 @@ namespace frm
}
- void OFormNavigationHelper::dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamAsciiName,
+ void OFormNavigationHelper::dispatchWithArgument( sal_Int16 _nFeatureId, const char* _pParamAsciiName,
const Any& _rParamValue ) const
{
FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId );
@@ -377,9 +377,9 @@ namespace frm
struct FeatureURL
{
const sal_Int16 nFormFeature;
- const sal_Char* pAsciiURL;
+ const char* pAsciiURL;
- FeatureURL( const sal_Int16 _nFormFeature, const sal_Char* _pAsciiURL )
+ FeatureURL( const sal_Int16 _nFormFeature, const char* _pAsciiURL )
:nFormFeature( _nFormFeature )
,pAsciiURL( _pAsciiURL )
{
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index fa4655780e44..10f664705e61 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -65,13 +65,13 @@ namespace frm
}
- URL UrlTransformer::getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const
+ URL UrlTransformer::getStrictURLFromAscii( const char* _pAsciiURL ) const
{
return getStrictURL( OUString::createFromAscii( _pAsciiURL ) );
}
- void UrlTransformer::parseSmartWithAsciiProtocol( css::util::URL& _rURL, const sal_Char* _pAsciiURL ) const
+ void UrlTransformer::parseSmartWithAsciiProtocol( css::util::URL& _rURL, const char* _pAsciiURL ) const
{
if ( implEnsureTransformer() )
m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) );
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index f89af1d1827a..3c9bce2ac4d9 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -77,7 +77,7 @@ namespace frm
with a blank target frame and no frame search flags
*/
css::uno::Reference< css::frame::XDispatch >
- queryDispatch( const sal_Char* _pAsciiURL );
+ queryDispatch( const char* _pAsciiURL );
};
diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx
index 63e94399e12d..9ab1d74e858b 100644
--- a/forms/source/inc/featuredispatcher.hxx
+++ b/forms/source/inc/featuredispatcher.hxx
@@ -49,7 +49,7 @@ namespace frm
*/
virtual void dispatchWithArgument(
sal_Int16 _nFeatureId,
- const sal_Char* _pParamName,
+ const char* _pParamName,
const css::uno::Any& _rParamValue
) const = 0;
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 200ab9d01996..c052473deb76 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -93,7 +93,7 @@ namespace frm
// IFeatureDispatcher
virtual void dispatch( sal_Int16 _nFeatureId ) const override;
- virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const css::uno::Any& _rParamValue ) const override;
+ virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const char* _pParamName, const css::uno::Any& _rParamValue ) const override;
virtual bool isEnabled( sal_Int16 _nFeatureId ) const override;
virtual bool getBooleanState( sal_Int16 _nFeatureId ) const override;
virtual OUString getStringState( sal_Int16 _nFeatureId ) const override;
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index 168c96d791e1..18a872ea9d93 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -49,12 +49,12 @@ namespace frm
/** returns a URL object for the given URL ASCII string
*/
css::util::URL
- getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const;
+ getStrictURLFromAscii( const char* _pAsciiURL ) const;
/** parses a given URL smartly, with a protocol given by ASCII string
*/
void
- parseSmartWithAsciiProtocol( css::util::URL& _rURL, const sal_Char* _pAsciiURL ) const;
+ parseSmartWithAsciiProtocol( css::util::URL& _rURL, const char* _pAsciiURL ) const;
private:
/** ensures that we have a URLTransformer instance in <member>m_xTransformer</member>
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index e7f0fb4cb352..0814e5fbee2e 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -80,9 +80,9 @@ namespace frm
struct FormatEntry
{
- const sal_Char* pDescription;
- sal_Int32 nKey;
- LocaleType eLocale;
+ const char* pDescription;
+ sal_Int32 nKey;
+ LocaleType eLocale;
};
}
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index dd89ec4cdf84..2da3bca4f76a 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -224,9 +224,9 @@ namespace frm
bool bLoad = KEY_F11 == nCode;
static struct
{
- const sal_Char* pDescription;
- const sal_Char* pExtension;
- EETextFormat eFormat;
+ const char* pDescription;
+ const char* pExtension;
+ EETextFormat eFormat;
} const aExportFormats[] =
{
{ "OASIS OpenDocument (*.xml)", "*.xml", EETextFormat::Xml },
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index bbb717139e19..d5d980e1b3e6 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -63,7 +63,7 @@ namespace frm
OUString lcl_getCommandURL( const sal_Int16 _nFormFeature )
{
- const sal_Char* pAsciiCommandName = nullptr;
+ const char* pAsciiCommandName = nullptr;
switch ( _nFormFeature )
{
case FormFeature::MoveAbsolute : pAsciiCommandName = "AbsoluteRecord"; break;
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index 96d981224c09..11bcc82278f4 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -69,7 +69,7 @@ void ComputedExpression::setExpression( const OUString& rExpression )
}
-bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const
+bool ComputedExpression::_checkExpression( const char* pExpression ) const
{
assert(pExpression && "no expression?");
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 3a69b1b2a8ec..374acef95584 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -62,7 +62,7 @@ protected:
/// implementation of isSimpleExpression
- bool _checkExpression( const sal_Char* pExpression ) const;
+ bool _checkExpression( const char* pExpression ) const;
/// allow manipulation of the expression before it is evaluated
// the default implementation is to do nothing...
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index 51d29ceed0c9..ab27bf5908ae 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -51,7 +51,7 @@ CSerializationURLEncoded::CSerializationURLEncoded()
mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
unreserved = alphanum | mark
*/
-bool CSerializationURLEncoded::is_unreserved(sal_Char c)
+bool CSerializationURLEncoded::is_unreserved(char c)
{
if (rtl::isAsciiAlphanumeric(static_cast<unsigned char>(c)))
return true;
@@ -73,7 +73,7 @@ void CSerializationURLEncoded::encode_and_append(const OUString& aString, OStri
{
OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() );
- sal_Char tmpChar[4];
+ char tmpChar[4];
while( *pString != 0)
{
diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx
index 9d429c5a40cb..e2977b4985ef 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.hxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.hxx
@@ -31,7 +31,7 @@ class CSerializationURLEncoded : public CSerialization
private:
css::uno::Reference< css::io::XPipe > m_aPipe;
- static bool is_unreserved(sal_Char);
+ static bool is_unreserved(char);
static void encode_and_append(const OUString& aString, OStringBuffer& aBuffer);
void serialize_node(const css::uno::Reference< css::xml::dom::XNode >& aNode);