forms/source/component/DatabaseForm.cxx | 2 +-
forms/source/helper/controlfeatureinterception.cxx | 2 +-
forms/source/helper/formnavigation.cxx | 6 +++---
forms/source/helper/urltransformer.cxx | 4 ++--
forms/source/inc/controlfeatureinterception.hxx | 2 +-
forms/source/inc/featuredispatcher.hxx | 2 +-
forms/source/inc/formnavigation.hxx | 2 +-
forms/source/inc/urltransformer.hxx | 4 ++--
forms/source/misc/limitedformats.cxx | 6 +++---
forms/source/richtext/richtextvclcontrol.cxx | 6 +++---
forms/source/solar/control/navtoolbar.cxx | 2 +-
forms/source/xforms/computedexpression.cxx | 2 +-
forms/source/xforms/computedexpression.hxx | 2 +-
forms/source/xforms/submission/serialization_urlencoded.cxx | 4 ++--
forms/source/xforms/submission/serialization_urlencoded.hxx | 2 +-
fpicker/source/aqua/FPentry.mm | 2 +-
fpicker/source/office/OfficeControlAccess.cxx | 4 ++--
fpicker/source/office/fps_office.cxx | 2 +-
fpicker/source/office/iodlg.cxx | 2 +-
fpicker/source/win32/FPentry.cxx | 2 +-
framework/inc/jobs/joburl.hxx | 2 +-
framework/inc/macros/registration.hxx | 2 +-
framework/inc/uielement/uicommanddescription.hxx | 2 +-
framework/source/jobs/joburl.cxx | 2 +-
framework/source/uielement/menubarmerger.cxx | 2 +-
framework/source/uielement/uicommanddescription.cxx | 2 +-
26 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 02b24d77476f93887691dde564351d6f8b770b8f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Dec 19 09:31:15 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 19 09:33:33 2019 +0100
sal_Char->char in forms..framework
Change-Id: I756c1f54d50403aa9b4f03dbbc2a387556f07084
Reviewed-on: https://gerrit.libreoffice.org/85475
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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);
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 4fe6b9839aac..5cec5eab213b 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -50,7 +50,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* fps_aqua_component_getFactory(
- const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+ const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
diff --git a/fpicker/source/office/OfficeControlAccess.cxx
b/fpicker/source/office/OfficeControlAccess.cxx
index ae8569b72c8c..296e9368779a 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -53,7 +53,7 @@ namespace svt
struct ControlDescription
{
- const sal_Char* pControlName;
+ const char* pControlName;
sal_Int16 nControlId;
PropFlags nPropertyFlags;
};
@@ -114,7 +114,7 @@ namespace svt
struct ControlProperty
{
- const sal_Char* pPropertyName;
+ const char* pPropertyName;
PropFlags nPropertyId;
};
diff --git a/fpicker/source/office/fps_office.cxx
b/fpicker/source/office/fps_office.cxx
index ed8313c67dbd..a08c1b1830d5 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -51,7 +51,7 @@ static const cppu::ImplementationEntry g_entries[] =
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * fps_office_component_getFactory(
- const sal_Char * pImplementationName, void * pServiceManager, void *
pRegistryKey)
+ const char * pImplementationName, void * pServiceManager, void *
pRegistryKey)
{
return cppu::component_getFactoryHelper (
pImplementationName, pServiceManager, pRegistryKey, g_entries);
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 8357cc8f330e..7a28b76562b2 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -262,7 +262,7 @@ namespace
/** retrieves the value of an environment variable
@return <TRUE/> if and only if the retrieved string value is not empty
*/
- bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString&
_rValue )
+ bool getEnvironmentValue( const char* _pAsciiEnvName, OUString& _rValue )
{
_rValue.clear();
OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName );
diff --git a/fpicker/source/win32/FPentry.cxx b/fpicker/source/win32/FPentry.cxx
index 2e24682d5544..a4e48f8865e5 100644
--- a/fpicker/source/win32/FPentry.cxx
+++ b/fpicker/source/win32/FPentry.cxx
@@ -53,7 +53,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory(
- const sal_Char* pImplName, void* pSrvManager, void* )
+ const char* pImplName, void* pSrvManager, void* )
{
void* pRet = nullptr;
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 5ea812d52ff1..32c2fc809aa5 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -98,7 +98,7 @@ class JobURL
private:
static bool implst_split( const OUString& sPart ,
- const sal_Char* pPartIdentifier ,
+ const char* pPartIdentifier ,
sal_Int32 nPartLength ,
OUString& rPartValue ,
OUString& rPartArguments );
diff --git a/framework/inc/macros/registration.hxx
b/framework/inc/macros/registration.hxx
index 55581ed3f9f6..878bc89c44bb 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -51,7 +51,7 @@
________________________________________________________________________________
// define method to instantiate new services
#define COMPONENTGETFACTORY( LIB, IFFACTORIES )
\
- extern "C" SAL_DLLPUBLIC_EXPORT void* LIB##_component_getFactory( const
sal_Char* pImplementationName, \
+ extern "C" SAL_DLLPUBLIC_EXPORT void* LIB##_component_getFactory( const
char* pImplementationName, \
void*
pServiceManager , \
void*
/*pRegistryKey*/ ) \
{
\
diff --git a/framework/inc/uielement/uicommanddescription.hxx
b/framework/inc/uielement/uicommanddescription.hxx
index d2eb672cd71d..652a8966805c 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -80,7 +80,7 @@ public:
protected:
UICommandDescription( const css::uno::Reference<
css::uno::XComponentContext>& rxContext, bool );
- void impl_fillElements(const sal_Char* _pName);
+ void impl_fillElements(const char* _pName);
OUString
m_aPrivateResourceURL;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index e010968fc92a..76fb1a6dd5b9 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -213,7 +213,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const
<FALSE/> otherwise.
*/
bool JobURL::implst_split( /*IN*/ const OUString& sPart ,
- /*IN*/ const sal_Char* pPartIdentifier ,
+ /*IN*/ const char* pPartIdentifier ,
/*IN*/ sal_Int32 nPartLength ,
/*OUT*/ OUString& rPartValue ,
/*OUT*/ OUString& rPartArguments )
diff --git a/framework/source/uielement/menubarmerger.cxx
b/framework/source/uielement/menubarmerger.cxx
index 6d702488ac5b..0ef3b9ee6334 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -64,7 +64,7 @@ void MenuBarMerger::RetrieveReferencePath(
const OUString& rReferencePathString,
::std::vector< OUString >& rReferencePath )
{
- const sal_Char aDelimiter = '\\';
+ const char aDelimiter = '\\';
rReferencePath.clear();
sal_Int32 nIndex( 0 );
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index 76a2f03391c1..77b8e13193f0 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -582,7 +582,7 @@ UICommandDescription::~UICommandDescription()
m_aUICommandsHashMap.clear();
m_xGenericUICommands.clear();
}
-void UICommandDescription::impl_fillElements(const sal_Char* _pName)
+void UICommandDescription::impl_fillElements(const char* _pName)
{
m_xModuleManager.set( ModuleManager::create( m_xContext ) );
Sequence< OUString > aElementNames = m_xModuleManager->getElementNames();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
