diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:31:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:33:33 +0100 |
| commit | 02b24d77476f93887691dde564351d6f8b770b8f (patch) | |
| tree | ba741033cd4b00996b370d23443bede3a41a7f88 /framework | |
| parent | fd8f926b0e409d49d235409daaf8f7aa8532cc40 (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 'framework')
| -rw-r--r-- | framework/inc/jobs/joburl.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/macros/registration.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 2 | ||||
| -rw-r--r-- | framework/source/jobs/joburl.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/uicommanddescription.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
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(); |