mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Char->char in forms..framework

Browse Source 
Change-Id: I756c1f54d50403aa9b4f03dbbc2a387556f07084
Reviewed-on: https://gerrit.libreoffice.org/85475
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-12-19 09:31:15 +02:00
parent fd8f926b0e
commit 02b24d7747
26 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/source/component/DatabaseForm.cxx
View File

@@ -933,7 +933,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rN
pChild->SetContentDisposition(aContentDisp); pChild->SetContentDisposition(aContentDisp);
rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding(); rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding ); const char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
OUString aBestMatchingEncoding = OUString::createFromAscii(pBestMatchingEncoding); OUString aBestMatchingEncoding = OUString::createFromAscii(pBestMatchingEncoding);
pChild->SetContentType( pChild->SetContentType(
"text/plain; charset=\"" + aBestMatchingEncoding + "\""); "text/plain; charset=\"" + aBestMatchingEncoding + "\"");

2
forms/source/helper/controlfeatureinterception.cxx
View File

@@ -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 ) ); return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) );
} }

6
forms/source/helper/formnavigation.cxx
View File

@@ -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 const Any& _rParamValue ) const
{ {
FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId ); FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId );
@@ -377,9 +377,9 @@ namespace frm
struct FeatureURL struct FeatureURL
{ {
const sal_Int16 nFormFeature; 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 ) :nFormFeature( _nFormFeature )
,pAsciiURL( _pAsciiURL ) ,pAsciiURL( _pAsciiURL )
{ {

4
forms/source/helper/urltransformer.cxx
View File

@@ -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 ) ); 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() ) if ( implEnsureTransformer() )
m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) ); m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) );

2
forms/source/inc/controlfeatureinterception.hxx
View File

@@ -77,7 +77,7 @@ namespace frm
with a blank target frame and no frame search flags with a blank target frame and no frame search flags
*/ */
css::uno::Reference< css::frame::XDispatch > css::uno::Reference< css::frame::XDispatch >
queryDispatch( const sal_Char* _pAsciiURL ); queryDispatch( const char* _pAsciiURL );
}; };

2
forms/source/inc/featuredispatcher.hxx
View File

@@ -49,7 +49,7 @@ namespace frm
*/ */
virtual void dispatchWithArgument( virtual void dispatchWithArgument(
sal_Int16 _nFeatureId, sal_Int16 _nFeatureId,
const sal_Char* _pParamName, const char* _pParamName,
const css::uno::Any& _rParamValue const css::uno::Any& _rParamValue
) const = 0; ) const = 0;

2
forms/source/inc/formnavigation.hxx
View File

@@ -93,7 +93,7 @@ namespace frm
// IFeatureDispatcher // IFeatureDispatcher
virtual void dispatch( sal_Int16 _nFeatureId ) const override; 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 isEnabled( sal_Int16 _nFeatureId ) const override;
virtual bool getBooleanState( sal_Int16 _nFeatureId ) const override; virtual bool getBooleanState( sal_Int16 _nFeatureId ) const override;
virtual OUString getStringState( sal_Int16 _nFeatureId ) const override; virtual OUString getStringState( sal_Int16 _nFeatureId ) const override;

4
forms/source/inc/urltransformer.hxx
View File

@@ -49,12 +49,12 @@ namespace frm
/** returns a URL object for the given URL ASCII string /** returns a URL object for the given URL ASCII string
*/ */
css::util::URL 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 /** parses a given URL smartly, with a protocol given by ASCII string
*/ */
void void
parseSmartWithAsciiProtocol( css::util::URL& _rURL, const sal_Char* _pAsciiURL ) const; parseSmartWithAsciiProtocol( css::util::URL& _rURL, const char* _pAsciiURL ) const;
private: private:
/** ensures that we have a URLTransformer instance in <member>m_xTransformer</member> /** ensures that we have a URLTransformer instance in <member>m_xTransformer</member>

2
forms/source/misc/limitedformats.cxx
View File

@@ -80,7 +80,7 @@ namespace frm
struct FormatEntry struct FormatEntry
{ {
const sal_Char* pDescription; const char* pDescription;
sal_Int32 nKey; sal_Int32 nKey;
LocaleType eLocale; LocaleType eLocale;
}; };

4
forms/source/richtext/richtextvclcontrol.cxx
View File

@@ -224,8 +224,8 @@ namespace frm
bool bLoad = KEY_F11 == nCode; bool bLoad = KEY_F11 == nCode;
static struct static struct
{ {
const sal_Char* pDescription; const char* pDescription;
const sal_Char* pExtension; const char* pExtension;
EETextFormat eFormat; EETextFormat eFormat;
} const aExportFormats[] = } const aExportFormats[] =
{ {

2
forms/source/solar/control/navtoolbar.cxx
View File

@@ -63,7 +63,7 @@ namespace frm
OUString lcl_getCommandURL( const sal_Int16 _nFormFeature ) OUString lcl_getCommandURL( const sal_Int16 _nFormFeature )
{ {
const sal_Char* pAsciiCommandName = nullptr; const char* pAsciiCommandName = nullptr;
switch ( _nFormFeature ) switch ( _nFormFeature )
{ {
case FormFeature::MoveAbsolute : pAsciiCommandName = "AbsoluteRecord"; break; case FormFeature::MoveAbsolute : pAsciiCommandName = "AbsoluteRecord"; break;

2
forms/source/xforms/computedexpression.cxx
View File

@@ -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?"); assert(pExpression && "no expression?");

2
forms/source/xforms/computedexpression.hxx
View File

@@ -62,7 +62,7 @@ protected:
/// implementation of isSimpleExpression /// 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 /// allow manipulation of the expression before it is evaluated
// the default implementation is to do nothing... // the default implementation is to do nothing...

4
forms/source/xforms/submission/serialization_urlencoded.cxx
View File

@@ -51,7 +51,7 @@ CSerializationURLEncoded::CSerializationURLEncoded()
mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
unreserved = alphanum | 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))) if (rtl::isAsciiAlphanumeric(static_cast<unsigned char>(c)))
return true; return true;
@@ -73,7 +73,7 @@ void CSerializationURLEncoded::encode_and_append(const OUString& aString, OStri
{ {
OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8); OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() ); const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() );
sal_Char tmpChar[4]; char tmpChar[4];
while( *pString != 0) while( *pString != 0)
{ {

2
forms/source/xforms/submission/serialization_urlencoded.hxx
View File

@@ -31,7 +31,7 @@ class CSerializationURLEncoded : public CSerialization
private: private:
css::uno::Reference< css::io::XPipe > m_aPipe; 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); static void encode_and_append(const OUString& aString, OStringBuffer& aBuffer);
void serialize_node(const css::uno::Reference< css::xml::dom::XNode >& aNode); void serialize_node(const css::uno::Reference< css::xml::dom::XNode >& aNode);

2
fpicker/source/aqua/FPentry.mm
View File

@@ -50,7 +50,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void* fps_aqua_component_getFactory( 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; void* pRet = nullptr;

4
fpicker/source/office/OfficeControlAccess.cxx
View File

@@ -53,7 +53,7 @@ namespace svt
struct ControlDescription struct ControlDescription
{ {
const sal_Char* pControlName; const char* pControlName;
sal_Int16 nControlId; sal_Int16 nControlId;
PropFlags nPropertyFlags; PropFlags nPropertyFlags;
}; };
@@ -114,7 +114,7 @@ namespace svt
struct ControlProperty struct ControlProperty
{ {
const sal_Char* pPropertyName; const char* pPropertyName;
PropFlags nPropertyId; PropFlags nPropertyId;
}; };

2
fpicker/source/office/fps_office.cxx
View File

@@ -51,7 +51,7 @@ static const cppu::ImplementationEntry g_entries[] =
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * fps_office_component_getFactory( 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 ( return cppu::component_getFactoryHelper (
pImplementationName, pServiceManager, pRegistryKey, g_entries); pImplementationName, pServiceManager, pRegistryKey, g_entries);

2
fpicker/source/office/iodlg.cxx
View File

@@ -262,7 +262,7 @@ namespace
/** retrieves the value of an environment variable /** retrieves the value of an environment variable
@return <TRUE/> if and only if the retrieved string value is not empty @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(); _rValue.clear();
OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName ); OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName );

2
fpicker/source/win32/FPentry.cxx
View File

@@ -53,7 +53,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory( SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory(
const sal_Char* pImplName, void* pSrvManager, void* ) const char* pImplName, void* pSrvManager, void* )
{ {
void* pRet = nullptr; void* pRet = nullptr;

2
framework/inc/jobs/joburl.hxx
View File

@@ -98,7 +98,7 @@ class JobURL
private: private:
static bool implst_split( const OUString& sPart , static bool implst_split( const OUString& sPart ,
const sal_Char* pPartIdentifier , const char* pPartIdentifier ,
sal_Int32 nPartLength , sal_Int32 nPartLength ,
OUString& rPartValue , OUString& rPartValue ,
OUString& rPartArguments ); OUString& rPartArguments );

2
framework/inc/macros/registration.hxx
View File

@@ -51,7 +51,7 @@ ________________________________________________________________________________
// define method to instantiate new services // define method to instantiate new services
#define COMPONENTGETFACTORY( LIB, IFFACTORIES ) \ #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* pServiceManager , \
void* /*pRegistryKey*/ ) \ void* /*pRegistryKey*/ ) \
{ \ { \

2
framework/inc/uielement/uicommanddescription.hxx
View File

@@ -80,7 +80,7 @@ public:
protected: protected:
UICommandDescription( const css::uno::Reference< css::uno::XComponentContext>& rxContext, bool ); 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; OUString m_aPrivateResourceURL;
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;

2
framework/source/jobs/joburl.cxx
View File

@@ -213,7 +213,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const
<FALSE/> otherwise. <FALSE/> otherwise.
*/ */
bool JobURL::implst_split( /*IN*/ const OUString& sPart , bool JobURL::implst_split( /*IN*/ const OUString& sPart ,
/*IN*/ const sal_Char* pPartIdentifier , /*IN*/ const char* pPartIdentifier ,
/*IN*/ sal_Int32 nPartLength , /*IN*/ sal_Int32 nPartLength ,
/*OUT*/ OUString& rPartValue , /*OUT*/ OUString& rPartValue ,
/*OUT*/ OUString& rPartArguments ) /*OUT*/ OUString& rPartArguments )

2
framework/source/uielement/menubarmerger.cxx
View File

@@ -64,7 +64,7 @@ void MenuBarMerger::RetrieveReferencePath(
const OUString& rReferencePathString, const OUString& rReferencePathString,
::std::vector< OUString >& rReferencePath ) ::std::vector< OUString >& rReferencePath )
{ {
const sal_Char aDelimiter = '\\'; const char aDelimiter = '\\';
rReferencePath.clear(); rReferencePath.clear();
sal_Int32 nIndex( 0 ); sal_Int32 nIndex( 0 );

2
framework/source/uielement/uicommanddescription.cxx
View File

@@ -582,7 +582,7 @@ UICommandDescription::~UICommandDescription()
m_aUICommandsHashMap.clear(); m_aUICommandsHashMap.clear();
m_xGenericUICommands.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 ) ); m_xModuleManager.set( ModuleManager::create( m_xContext ) );
Sequence< OUString > aElementNames = m_xModuleManager->getElementNames(); Sequence< OUString > aElementNames = m_xModuleManager->getElementNames();