diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 11:52:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 12:23:44 +0100 |
commit | fb1eac64df88baae9f211d052793773686c0e180 (patch) | |
tree | a40173243f206c2b056ea0866659710232772f4a | |
parent | 82dce922e6d36b40dd0571b0c00666cd6fc1a8ac (diff) |
sal_Char->char in avmedia..basic
Change-Id: Ied1331d979539ef1183da64c55351b57d24f4a4f
Reviewed-on: https://gerrit.libreoffice.org/85371
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | avmedia/source/gstreamer/gstuno.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/macavf/macavfuno.mm | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcuno.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/win/winuno.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/doceventnotifier.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/register.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolypolygontools.cxx | 2 | ||||
-rw-r--r-- | basic/qa/cppunit/basictest.cxx | 2 | ||||
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 8 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 16 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 8 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 8 | ||||
-rw-r--r-- | include/basegfx/polygon/b2dpolypolygontools.hxx | 2 |
16 files changed, 38 insertions, 38 deletions
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index cefdf619a455..2ca447d385fb 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -35,7 +35,7 @@ static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Referenc return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediagst_component_getFactory( const char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm index 60435b8337a3..dbee2e8cea49 100644 --- a/avmedia/source/macavf/macavfuno.mm +++ b/avmedia/source/macavf/macavfuno.mm @@ -28,7 +28,7 @@ static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Referenc return uno::Reference< uno::XInterface >( *new ::avmedia::macavf::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index d894c1c1cdd0..dba992eb9290 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -45,7 +45,7 @@ static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Referenc return manager; } -extern "C" SAL_DLLPUBLIC_EXPORT void* avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediavlc_component_getFactory( const char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index 16d771838fca..90b1f3e405d9 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -32,7 +32,7 @@ static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Referenc return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediawin_component_getFactory( const char* pImplName, void* pServiceManager, void* ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index c29f3e179636..83fe6a481768 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -110,7 +110,7 @@ OUString getTextEngineText (ExtTextEngine& rEngine) aMemStream.SetLineDelimiter( LINEEND_LF ); rEngine.Write( aMemStream ); std::size_t nSize = aMemStream.Tell(); - OUString aText( static_cast<const sal_Char*>(aMemStream.GetData()), + OUString aText( static_cast<const char*>(aMemStream.GetData()), nSize, RTL_TEXTENCODING_UTF8 ); return aText; } diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index 96eea35b662b..b8806a58bdd3 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -133,7 +133,7 @@ namespace basctl struct EventEntry { - const sal_Char* pEventName; + const char* pEventName; void (DocumentEventListener::*listenerMethod)( const ScriptDocument& _rDocument ); }; static EventEntry const aEvents[] = { diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index f74ff4075337..c73c97eeadf8 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* basctl_component_getFactory( const sal_Char* pImplementationName, +SAL_DLLPUBLIC_EXPORT void* basctl_component_getFactory( const char* pImplementationName, void* pServiceManager, void* ) { diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx index 062e37da9dae..e1ff392ae306 100644 --- a/basegfx/source/polygon/b2dpolypolygontools.cxx +++ b/basegfx/source/polygon/b2dpolypolygontools.cxx @@ -416,7 +416,7 @@ namespace basegfx return aRetval; } - B2DPolyPolygon createSevenSegmentPolyPolygon(sal_Char nNumber, bool bLitSegments) + B2DPolyPolygon createSevenSegmentPolyPolygon(char nNumber, bool bLitSegments) { // config here // { diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx index f309cc13f00a..635da6e5ec0c 100644 --- a/basic/qa/cppunit/basictest.cxx +++ b/basic/qa/cppunit/basictest.cxx @@ -57,7 +57,7 @@ void MacroSnippet::LoadSourceFromFile( const OUString& sMacroFileURL ) { if(size == size_read) { - OUString sCode(static_cast<sal_Char*>(buffer), size, RTL_TEXTENCODING_UTF8); + OUString sCode(static_cast<char*>(buffer), size, RTL_TEXTENCODING_UTF8); sSource = sCode; } } diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index d138b77ce5e6..582e462ab93e 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -61,10 +61,10 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer virtual void onNewRootStorage() override; - virtual const sal_Char* getInfoFileName() const override; - virtual const sal_Char* getOldInfoFileName() const override; - virtual const sal_Char* getLibElementFileExtension() const override; - virtual const sal_Char* getLibrariesDir() const override; + virtual const char* getInfoFileName() const override; + virtual const char* getOldInfoFileName() const override; + virtual const char* getLibElementFileExtension() const override; + virtual const char* getLibrariesDir() const override; public: SfxDialogLibraryContainer(); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index d07bfafbfbaf..3a86f059c839 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -308,10 +308,10 @@ protected: void init( const OUString& rInitialDocumentURL, const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage ); - virtual const sal_Char* getInfoFileName() const = 0; - virtual const sal_Char* getOldInfoFileName() const = 0; - virtual const sal_Char* getLibElementFileExtension() const = 0; - virtual const sal_Char* getLibrariesDir() const = 0; + virtual const char* getInfoFileName() const = 0; + virtual const char* getOldInfoFileName() const = 0; + virtual const char* getLibElementFileExtension() const = 0; + virtual const char* getLibrariesDir() const = 0; // Handle maLibInfoFileURL and maStorageURL correctly void checkStorageURL diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index bdf0a0248ad3..98fce14b6040 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -79,10 +79,10 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas // OldBasicPassword interface virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) override; - virtual const sal_Char* getInfoFileName() const override; - virtual const sal_Char* getOldInfoFileName() const override; - virtual const sal_Char* getLibElementFileExtension() const override; - virtual const sal_Char* getLibrariesDir() const override; + virtual const char* getInfoFileName() const override; + virtual const char* getOldInfoFileName() const override; + virtual const char* getLibElementFileExtension() const override; + virtual const char* getLibrariesDir() const override; public: SfxScriptLibraryContainer(); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 93a8e877497c..8d2ecb974d45 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -324,7 +324,7 @@ static void implChr( SbxArray& rPar, bool bChrW ) OUString aStr; if( !bChrW && SbiRuntime::isVBAEnabled() ) { - sal_Char c = static_cast<sal_Char>(pArg->GetByte()); + char c = static_cast<char>(pArg->GetByte()); aStr = OUString(&c, 1, osl_getThreadTextEncoding()); } else @@ -2527,10 +2527,10 @@ void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool) // Function looks for wildcards, removes them and always returns the pure path static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLData) { - static const sal_Char cDelim1 = '/'; - static const sal_Char cDelim2 = '\\'; - static const sal_Char cWild1 = '*'; - static const sal_Char cWild2 = '?'; + static const char cDelim1 = '/'; + static const char cDelim2 = '\\'; + static const char cWild1 = '*'; + static const char cWild2 = '?'; rRTLData.pWildCard.reset(); rRTLData.sFullNameToBeChecked.clear(); @@ -4178,10 +4178,10 @@ void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool) // convert the string to byte string, preserving unicode (2 bytes per character) sal_Int32 nSize = aNewStr.getLength()*2; const sal_Unicode* pSrc = aNewStr.getStr(); - std::unique_ptr<sal_Char[]> pChar(new sal_Char[nSize+1]); + std::unique_ptr<char[]> pChar(new char[nSize+1]); for( sal_Int32 i=0; i < nSize; i++ ) { - pChar[i] = static_cast< sal_Char >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff ); + pChar[i] = static_cast< char >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff ); if( i%2 ) { pSrc++; @@ -4199,7 +4199,7 @@ void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool) { // there is no concept about default codepage in unix. so it is incorrectly in unix OString aOStr = OUStringToOString(aNewStr,osl_getThreadTextEncoding()); - const sal_Char* pChar = aOStr.getStr(); + const char* pChar = aOStr.getStr(); sal_Int32 nArraySize = aOStr.getLength(); SbxDimArray* pArray = new SbxDimArray(SbxBYTE); bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() ); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index e066b000a078..a3f8fd6f565e 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -62,10 +62,10 @@ using com::sun::star::uno::Reference; // Implementation class SfxDialogLibraryContainer -const sal_Char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; } -const sal_Char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; } -const sal_Char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; } -const sal_Char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; } +const char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; } +const char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; } +const char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; } +const char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; } // Ctor for service SfxDialogLibraryContainer::SfxDialogLibraryContainer() diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 18f2dfd3baa0..cf55c7ed28af 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -66,10 +66,10 @@ using namespace osl; // Implementation class SfxScriptLibraryContainer -const sal_Char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; } -const sal_Char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; } -const sal_Char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; } -const sal_Char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; } +const char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; } +const char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; } +const char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; } +const char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; } // OldBasicPassword interface void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index d1f37202d622..d52cbc5decad 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -264,7 +264,7 @@ namespace basegfx are 'lit' for the given number. Return un-lit segments otherwise. */ - B2DPolyPolygon createSevenSegmentPolyPolygon(sal_Char cNumber, bool bLitSegments); + B2DPolyPolygon createSevenSegmentPolyPolygon(char cNumber, bool bLitSegments); /** snap some polygon coordinates to discrete coordinates |