include/toolkit/controls/accessiblecontrolcontext.hxx | 2 include/toolkit/helper/servicenames.hxx | 144 ++++++++--------- include/tools/inetmime.hxx | 2 include/tools/inetstrm.hxx | 18 +- toolkit/source/awt/vclxtoolkit.cxx | 2 toolkit/source/controls/accessiblecontrolcontext.cxx | 2 toolkit/source/controls/grid/gridcolumn.cxx | 2 toolkit/source/controls/grid/gridcolumn.hxx | 4 toolkit/source/helper/servicenames.cxx | 146 +++++++++--------- tools/qa/cppunit/test_reversemap.cxx | 4 tools/source/fsys/urlobj.cxx | 10 - tools/source/inet/inetmime.cxx | 110 ++++++------- tools/source/inet/inetmsg.cxx | 4 tools/source/inet/inetstrm.cxx | 20 +- tools/source/ref/globname.cxx | 2 tools/source/reversemap/bestreversemap.cxx | 2 tools/source/stream/stream.cxx | 10 - 17 files changed, 242 insertions(+), 242 deletions(-)
New commits: commit 1a53e60d444385c9b97ed16d245edbd44f8a5ac4 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 23 11:55:15 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 23 15:12:29 2019 +0100 sal_Char->char in tools Change-Id: Id8be02e445ac439439b2f78ba4a7376dd19ce360 Reviewed-on: https://gerrit.libreoffice.org/85744 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 80820a2b722a..ce0469fa131a 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -143,7 +143,7 @@ public: */ static bool equalIgnoreCase(const sal_Unicode * pBegin1, const sal_Unicode * pEnd1, - const sal_Char * pString2); + const char * pString2); static bool scanUnsigned(const sal_Unicode *& rBegin, const sal_Unicode * pEnd, bool bLeadingZeroes, diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx index 8c74b9703d08..48e371fa0105 100644 --- a/include/tools/inetstrm.hxx +++ b/include/tools/inetstrm.hxx @@ -32,15 +32,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream INetMIMEMessage *pSourceMsg; bool bHeaderGenerated; - std::vector<sal_Char> mvBuffer; - sal_Char *pRead; - sal_Char *pWrite; + std::vector<char> mvBuffer; + char *pRead; + char *pWrite; std::unique_ptr<SvStream> pMsgStrm; SvMemoryStream maMsgBuffer; - sal_Char *pMsgRead; - sal_Char *pMsgWrite; + char *pMsgRead; + char *pMsgWrite; bool done; @@ -50,15 +50,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) = delete; INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) = delete; - int GetHeaderLine(sal_Char *pData, sal_uInt32 nSize); - int GetBodyLine(sal_Char *pData, sal_uInt32 nSize); - int GetMsgLine(sal_Char *pData, sal_uInt32 nSize); + int GetHeaderLine(char *pData, sal_uInt32 nSize); + int GetBodyLine(char *pData, sal_uInt32 nSize); + int GetMsgLine(char *pData, sal_uInt32 nSize); public: explicit INetMIMEMessageStream(INetMIMEMessage *pMsg, bool headerGenerated); ~INetMIMEMessageStream(); - int Read (sal_Char *pData, sal_uInt32 nSize); + int Read (char *pData, sal_uInt32 nSize); }; #endif diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx index 04ed1741d211..be70ade79585 100644 --- a/tools/qa/cppunit/test_reversemap.cxx +++ b/tools/qa/cppunit/test_reversemap.cxx @@ -55,9 +55,9 @@ namespace void Test::testEncoding(rtl_TextEncoding eEncoding) { //Taking the single byte legacy encodings, fill in all possible values - std::vector<sal_Char> aAllChars(255); + std::vector<char> aAllChars(255); for (int i = 1; i <= 255; ++i) - aAllChars[i-1] = static_cast<sal_Char>(i); + aAllChars[i-1] = static_cast<char>(i); //Some slots are unused, so don't map to private, just set them to 'X' sal_uInt32 const convertFlags = OSTRING_TO_OUSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index e07cfd04035e..be9dadeb8043 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -289,8 +289,8 @@ int INetURLObject::SubString::compare(SubString const & rOther, struct INetURLObject::SchemeInfo { - sal_Char const * m_pScheme; - sal_Char const * m_pPrefix; + char const * m_pScheme; + char const * m_pPrefix; bool const m_bAuthority; bool const m_bUser; bool const m_bAuth; @@ -305,8 +305,8 @@ struct INetURLObject::PrefixInfo { enum class Kind { Official, Internal, External }; // order is important! - sal_Char const * m_pPrefix; - sal_Char const * m_pTranslatedPrefix; + char const * m_pPrefix; + char const * m_pTranslatedPrefix; INetProtocol const m_eScheme; Kind const m_eKind; }; @@ -2181,7 +2181,7 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& } if (pFirst == pLast) { - sal_Char const * q = pFirst->m_pPrefix + i; + char const * q = pFirst->m_pPrefix + i; while (p < pEnd && *q != '\0' && rtl::toAsciiLowerCase(*p) == static_cast<unsigned char>(*q)) { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index b96e463154e4..cc9d0c1e94fc 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -32,8 +32,8 @@ namespace { -rtl_TextEncoding getCharsetEncoding(const sal_Char * pBegin, - const sal_Char * pEnd); +rtl_TextEncoding getCharsetEncoding(const char * pBegin, + const char * pEnd); /** Check for US-ASCII white space character. @@ -92,8 +92,8 @@ bool isMIMECharsetEncoding(rtl_TextEncoding eEncoding) return rtl_isOctetTextEncoding(eEncoding); } -std::unique_ptr<sal_Unicode[]> convertToUnicode(const sal_Char * pBegin, - const sal_Char * pEnd, +std::unique_ptr<sal_Unicode[]> convertToUnicode(const char * pBegin, + const char * pEnd, rtl_TextEncoding eEncoding, sal_Size & rSize) { @@ -161,36 +161,36 @@ void writeUTF8(OStringBuffer & rSink, sal_uInt32 nChar) DBG_ASSERT(nChar < 0x80000000, "writeUTF8(): Bad char"); if (nChar < 0x80) - rSink.append(sal_Char(nChar)); + rSink.append(char(nChar)); else if (nChar < 0x800) - rSink.append(sal_Char(nChar >> 6 | 0xC0)) - .append(sal_Char((nChar & 0x3F) | 0x80)); + rSink.append(char(nChar >> 6 | 0xC0)) + .append(char((nChar & 0x3F) | 0x80)); else if (nChar < 0x10000) - rSink.append(sal_Char(nChar >> 12 | 0xE0)) - .append(sal_Char((nChar >> 6 & 0x3F) | 0x80)) - .append(sal_Char((nChar & 0x3F) | 0x80)); + rSink.append(char(nChar >> 12 | 0xE0)) + .append(char((nChar >> 6 & 0x3F) | 0x80)) + .append(char((nChar & 0x3F) | 0x80)); else if (nChar < 0x200000) - rSink.append(sal_Char(nChar >> 18 | 0xF0)) - .append(sal_Char((nChar >> 12 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 6 & 0x3F) | 0x80)) - .append(sal_Char((nChar & 0x3F) | 0x80)); + rSink.append(char(nChar >> 18 | 0xF0)) + .append(char((nChar >> 12 & 0x3F) | 0x80)) + .append(char((nChar >> 6 & 0x3F) | 0x80)) + .append(char((nChar & 0x3F) | 0x80)); else if (nChar < 0x4000000) - rSink.append(sal_Char(nChar >> 24 | 0xF8)) - .append(sal_Char((nChar >> 18 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 12 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 6 & 0x3F) | 0x80)) - .append(sal_Char((nChar & 0x3F) | 0x80)); + rSink.append(char(nChar >> 24 | 0xF8)) + .append(char((nChar >> 18 & 0x3F) | 0x80)) + .append(char((nChar >> 12 & 0x3F) | 0x80)) + .append(char((nChar >> 6 & 0x3F) | 0x80)) + .append(char((nChar & 0x3F) | 0x80)); else - rSink.append(sal_Char(nChar >> 30 | 0xFC)) - .append(sal_Char((nChar >> 24 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 18 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 12 & 0x3F) | 0x80)) - .append(sal_Char((nChar >> 6 & 0x3F) | 0x80)) - .append(sal_Char((nChar & 0x3F) | 0x80)); + rSink.append(char(nChar >> 30 | 0xFC)) + .append(char((nChar >> 24 & 0x3F) | 0x80)) + .append(char((nChar >> 18 & 0x3F) | 0x80)) + .append(char((nChar >> 12 & 0x3F) | 0x80)) + .append(char((nChar >> 6 & 0x3F) | 0x80)) + .append(char((nChar & 0x3F) | 0x80)); } -bool translateUTF8Char(const sal_Char *& rBegin, - const sal_Char * pEnd, +bool translateUTF8Char(const char *& rBegin, + const char * pEnd, sal_uInt32 & rCharacter) { if (rBegin == pEnd || static_cast< unsigned char >(*rBegin) < 0x80 @@ -200,7 +200,7 @@ bool translateUTF8Char(const sal_Char *& rBegin, int nCount; sal_uInt32 nMin; sal_uInt32 nUCS4; - const sal_Char * p = rBegin; + const char * p = rBegin; if (static_cast< unsigned char >(*p) < 0xE0) { nCount = 1; @@ -247,8 +247,8 @@ bool translateUTF8Char(const sal_Char *& rBegin, return true; } -void appendISO88591(OUStringBuffer & rText, sal_Char const * pBegin, - sal_Char const * pEnd); +void appendISO88591(OUStringBuffer & rText, char const * pBegin, + char const * pEnd); struct Parameter { @@ -281,8 +281,8 @@ bool parseParameters(ParameterList const & rInput, // appendISO88591 -void appendISO88591(OUStringBuffer & rText, sal_Char const * pBegin, - sal_Char const * pEnd) +void appendISO88591(OUStringBuffer & rText, char const * pBegin, + char const * pEnd) { sal_Int32 nLength = pEnd - pBegin; std::unique_ptr<sal_Unicode[]> pBuffer(new sal_Unicode[nLength]); @@ -644,7 +644,7 @@ sal_Unicode const * scanParameters(sal_Unicode const * pBegin, int nWeight2 = INetMIME::getHexWeight(p[1]); if (nWeight1 >= 0 && nWeight2 >= 0) { - aSink.append(sal_Char(nWeight1 << 4 | nWeight2)); + aSink.append(char(nWeight1 << 4 | nWeight2)); p += 2; continue; } @@ -722,9 +722,9 @@ sal_Unicode const * scanParameters(sal_Unicode const * pBegin, return parseParameters(aList, pParameters) ? pParameterBegin : pBegin; } -bool equalIgnoreCase(const sal_Char * pBegin1, - const sal_Char * pEnd1, - const sal_Char * pString2) +bool equalIgnoreCase(const char * pBegin1, + const char * pEnd1, + const char * pString2) { DBG_ASSERT(pBegin1 && pBegin1 <= pEnd1 && pString2, "equalIgnoreCase(): Bad sequences"); @@ -740,7 +740,7 @@ bool equalIgnoreCase(const sal_Char * pBegin1, struct EncodingEntry { - sal_Char const * m_aName; + char const * m_aName; rtl_TextEncoding const m_eEncoding; }; @@ -924,8 +924,8 @@ static EncodingEntry const aEncodingMap[] { "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 }, { "CSUNICODE", RTL_TEXTENCODING_UCS2 } }; -rtl_TextEncoding getCharsetEncoding(sal_Char const * pBegin, - sal_Char const * pEnd) +rtl_TextEncoding getCharsetEncoding(char const * pBegin, + char const * pEnd) { for (const EncodingEntry& i : aEncodingMap) if (equalIgnoreCase(pBegin, pEnd, i.m_aName)) @@ -988,7 +988,7 @@ bool INetMIME::isIMAPAtomChar(sal_uInt32 nChar) // static bool INetMIME::equalIgnoreCase(const sal_Unicode * pBegin1, const sal_Unicode * pEnd1, - const sal_Char * pString2) + const char * pString2) { DBG_ASSERT(pBegin1 && pBegin1 <= pEnd1 && pString2, "INetMIME::equalIgnoreCase(): Bad sequences"); @@ -1092,28 +1092,28 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) // base64 = ALPHA / DIGIT / "+" / "/" - const sal_Char * pBegin = rBody.getStr(); - const sal_Char * pEnd = pBegin + rBody.getLength(); + const char * pBegin = rBody.getStr(); + const char * pEnd = pBegin + rBody.getLength(); OUStringBuffer sDecoded; - const sal_Char * pCopyBegin = pBegin; + const char * pCopyBegin = pBegin; /* bool bStartEncodedWord = true; */ - const sal_Char * pWSPBegin = pBegin; + const char * pWSPBegin = pBegin; - for (const sal_Char * p = pBegin; p != pEnd;) + for (const char * p = pBegin; p != pEnd;) { OUString sEncodedText; if (*p == '=' /* && bStartEncodedWord */) { - const sal_Char * q = p + 1; + const char * q = p + 1; bool bEncodedWord = q != pEnd && *q++ == '?'; rtl_TextEncoding eCharsetEncoding = RTL_TEXTENCODING_DONTKNOW; if (bEncodedWord) { - const sal_Char * pCharsetBegin = q; - const sal_Char * pLanguageBegin = nullptr; + const char * pCharsetBegin = q; + const char * pLanguageBegin = nullptr; int nAlphaCount = 0; for (bool bDone = false; !bDone;) if (q == pEnd) @@ -1123,7 +1123,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) } else { - sal_Char cChar = *q++; + char cChar = *q++; switch (cChar) { case '*': @@ -1245,7 +1245,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) if (bEncodedWord) { for (int nShift = 16; nCount-- > 0; nShift -= 8) - sText.append(sal_Char(nValue >> nShift & 0xFF)); + sText.append(char(nValue >> nShift & 0xFF)); if (*q == '?') { ++q; @@ -1262,8 +1262,8 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) } else { - const sal_Char * pEncodedTextBegin = q; - const sal_Char * pEncodedTextCopyBegin = q; + const char * pEncodedTextBegin = q; + const char * pEncodedTextCopyBegin = q; for (bool bDone = false; !bDone;) if (q == pEnd) { @@ -1294,7 +1294,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) sText.append(rBody.copy( (pEncodedTextCopyBegin - pBegin), (q - 1 - pEncodedTextCopyBegin))); - sText.append(sal_Char(nDigit1 << 4 | nDigit2)); + sText.append(char(nDigit1 << 4 | nDigit2)); q += 2; pEncodedTextCopyBegin = q; break; @@ -1384,8 +1384,8 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody) default: { - const sal_Char * pUTF8Begin = p - 1; - const sal_Char * pUTF8End = pUTF8Begin; + const char * pUTF8Begin = p - 1; + const char * pUTF8End = pUTF8Begin; sal_uInt32 nCharacter = 0; if (translateUTF8Char(pUTF8End, pEnd, nCharacter)) { diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 918746eeaea5..f8912bb9d231 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -46,7 +46,7 @@ void INetMIMEMessage::SetHeaderField_Impl ( * 1*DIGIT (delta seconds) */ -static const sal_Char *months[12] = +static const char *months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" @@ -259,7 +259,7 @@ void INetMIMEMessage::EnableAttachMultipartFormDataChild() return; // Generate a unique boundary from current time. - sal_Char sTail[16 + 1]; + char sTail[16 + 1]; tools::Time aCurTime( tools::Time::SYSTEM ); sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32; diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index a26212fa1761..e2a0e9770d13 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -26,9 +26,9 @@ #include <tools/inetmsg.hxx> #include <tools/inetstrm.hxx> -int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize) +int INetMIMEMessageStream::GetHeaderLine(char* pData, sal_uInt32 nSize) { - sal_Char* pWBuf = pData; + char* pWBuf = pData; sal_uInt32 i, n; @@ -49,7 +49,7 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize) } } - pMsgWrite = const_cast<char *>(static_cast<sal_Char const *>(maMsgBuffer.GetData())); + pMsgWrite = const_cast<char *>(static_cast<char const *>(maMsgBuffer.GetData())); pMsgRead = pMsgWrite + maMsgBuffer.Tell(); } @@ -69,10 +69,10 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize) return (pWBuf - pData); } -int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uInt32 nSize) +int INetMIMEMessageStream::GetBodyLine(char* pData, sal_uInt32 nSize) { - sal_Char* pWBuf = pData; - sal_Char* pWEnd = pData + nSize; + char* pWBuf = pData; + char* pWEnd = pData + nSize; if (pSourceMsg->GetDocumentLB()) { @@ -86,7 +86,7 @@ int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uInt32 nSize) return (pWBuf - pData); } -int INetMIMEMessageStream::GetMsgLine(sal_Char* pData, sal_uInt32 nSize) +int INetMIMEMessageStream::GetMsgLine(char* pData, sal_uInt32 nSize) { // Check for header or body. if (!bHeaderGenerated) @@ -246,10 +246,10 @@ INetMIMEMessageStream::~INetMIMEMessageStream() pChildStrm.reset(); } -int INetMIMEMessageStream::Read(sal_Char* pData, sal_uInt32 nSize) +int INetMIMEMessageStream::Read(char* pData, sal_uInt32 nSize) { - sal_Char* pWBuf = pData; - sal_Char* pWEnd = pData + nSize; + char* pWBuf = pData; + char* pWEnd = pData + nSize; while (pWBuf < pWEnd) { diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index eed9b8fd5a04..b4ce33f9a339 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -229,7 +229,7 @@ OUString SvGlobalName::GetHexName() const { OStringBuffer aHexBuffer(36); - sal_Char buf[ 10 ]; + char buf[ 10 ]; sprintf( buf, "%8.8" SAL_PRIXUINT32, pImp->szData.Data1 ); aHexBuffer.append(buf); aHexBuffer.append('-'); diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx index 83b642368caa..e2b51bf5c000 100644 --- a/tools/source/reversemap/bestreversemap.cxx +++ b/tools/source/reversemap/bestreversemap.cxx @@ -32,7 +32,7 @@ struct Encoder } void checkSupports(sal_Unicode c) { - sal_Char aTempArray[8]; + char aTempArray[8]; sal_Size nTempSize; sal_uInt32 nCvtInfo; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 06b09c2a4a6d..a85f4d1be5a2 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -450,10 +450,10 @@ bool SvStream::ReadByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet, bool SvStream::ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead ) { - sal_Char buf[256+1]; + char buf[256+1]; bool bEnd = false; sal_uInt64 nOldFilePos = Tell(); - sal_Char c = 0; + char c = 0; std::size_t nTotalLen = 0; OStringBuffer aBuf(4096); @@ -621,7 +621,7 @@ OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) { OStringBuffer aOutput(256); - sal_Char buf[ 256 + 1 ]; + char buf[ 256 + 1 ]; bool bEnd = false; sal_uInt64 nFilePos = rStream.Tell(); @@ -632,7 +632,7 @@ OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) break; std::size_t nReallyRead = nLen; - const sal_Char* pPtr = buf; + const char* pPtr = buf; while (nLen && *pPtr) { ++pPtr; @@ -1516,7 +1516,7 @@ void SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const } } -static unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersion) +static unsigned char implGetCryptMask(const char* pStr, sal_Int32 nLen, long nVersion) { unsigned char nCryptMask = 0; commit b0543bb714e5a646dae0ede594df4a564e569951 Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 23 11:19:54 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 23 15:12:20 2019 +0100 sal_Char->char in toolkit Change-Id: I3016c8c672beb5a2d5f772f8a2ddc0047088e1da Reviewed-on: https://gerrit.libreoffice.org/85743 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 14f0c57947d8..dfa6cf358ca5 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -89,7 +89,7 @@ namespace toolkit virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // retrieves the value of a string property from the model, if the property is present - OUString getModelStringProperty( const sal_Char* _pPropertyName ); + OUString getModelStringProperty( const char* _pPropertyName ); // starts listening at the control model (currently for disposal only) void startModelListening( ); diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx index 048eed48e84a..662378bbd400 100644 --- a/include/toolkit/helper/servicenames.hxx +++ b/include/toolkit/helper/servicenames.hxx @@ -22,82 +22,82 @@ #include <sal/types.h> -extern const sal_Char szServiceName_Toolkit[], szServiceName2_Toolkit[]; -extern const sal_Char szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[]; -extern const sal_Char szServiceName_PopupMenu[], szServiceName2_PopupMenu[]; -extern const sal_Char szServiceName_MenuBar[], szServiceName2_MenuBar[]; -extern const sal_Char szServiceName_Pointer[], szServiceName2_Pointer[]; -extern const sal_Char szServiceName_UnoControlContainer[]; -extern const sal_Char szServiceName_UnoControlContainerModel[]; -extern const sal_Char szServiceName2_UnoMultiPageControl[]; -extern const sal_Char szServiceName2_UnoMultiPageModel[]; -extern const sal_Char szServiceName2_UnoPageControl[]; -extern const sal_Char szServiceName2_UnoPageModel[]; -extern const sal_Char szServiceName2_UnoFrameControl[]; -extern const sal_Char szServiceName2_UnoFrameModel[]; -extern const sal_Char szServiceName_TabController[], szServiceName2_TabController[]; -extern const sal_Char szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[]; -extern const sal_Char szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[]; -extern const sal_Char szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[]; -extern const sal_Char szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[]; -extern const sal_Char szServiceName_UnoControlEditModel[]; -extern const sal_Char szServiceName_UnoControlFileControl[]; -extern const sal_Char szServiceName_UnoControlFileControlModel[]; -extern const sal_Char szServiceName_UnoControlButton[]; -extern const sal_Char szServiceName_UnoControlButtonModel[]; -extern const sal_Char szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[]; -extern const sal_Char szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[]; -extern const sal_Char szServiceName_UnoControlImageControl[]; -extern const sal_Char szServiceName_UnoControlImageControlModel[]; -extern const sal_Char szServiceName_UnoControlRadioButton[]; -extern const sal_Char szServiceName_UnoControlRadioButtonModel[]; -extern const sal_Char szServiceName_UnoControlCheckBox[]; -extern const sal_Char szServiceName_UnoControlCheckBoxModel[]; -extern const sal_Char szServiceName_UnoControlListBox[]; -extern const sal_Char szServiceName_UnoControlListBoxModel[]; -extern const sal_Char szServiceName_UnoControlComboBox[]; -extern const sal_Char szServiceName_UnoControlComboBoxModel[]; -extern const sal_Char szServiceName_UnoControlFixedText[]; -extern const sal_Char szServiceName_UnoControlGroupBox[]; -extern const sal_Char szServiceName_UnoControlGroupBoxModel[]; -extern const sal_Char szServiceName_UnoControlDateField[]; -extern const sal_Char szServiceName_UnoControlDateFieldModel[]; -extern const sal_Char szServiceName_UnoControlTimeField[]; -extern const sal_Char szServiceName_UnoControlTimeFieldModel[]; -extern const sal_Char szServiceName_UnoControlNumericField[]; -extern const sal_Char szServiceName_UnoControlNumericFieldModel[]; -extern const sal_Char szServiceName_UnoControlCurrencyField[]; -extern const sal_Char szServiceName_UnoControlCurrencyFieldModel[]; -extern const sal_Char szServiceName_UnoControlPatternField[]; -extern const sal_Char szServiceName_UnoControlPatternFieldModel[]; -extern const sal_Char szServiceName_UnoControlFormattedField[]; -extern const sal_Char szServiceName_UnoControlFormattedFieldModel[]; -extern const sal_Char szServiceName_UnoControlProgressBar[]; -extern const sal_Char szServiceName_UnoControlProgressBarModel[]; -extern const sal_Char szServiceName_UnoControlScrollBar[]; -extern const sal_Char szServiceName_UnoControlScrollBarModel[]; -extern const sal_Char szServiceName_UnoControlFixedLine[]; -extern const sal_Char szServiceName_UnoControlFixedLineModel[]; -extern const sal_Char szServiceName_PrinterServer[], szServiceName2_PrinterServer[]; -extern const sal_Char szServiceName_UnoControlRoadmap[]; -extern const sal_Char szServiceName_UnoControlRoadmapModel[]; +extern const char szServiceName_Toolkit[], szServiceName2_Toolkit[]; +extern const char szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[]; +extern const char szServiceName_PopupMenu[], szServiceName2_PopupMenu[]; +extern const char szServiceName_MenuBar[], szServiceName2_MenuBar[]; +extern const char szServiceName_Pointer[], szServiceName2_Pointer[]; +extern const char szServiceName_UnoControlContainer[]; +extern const char szServiceName_UnoControlContainerModel[]; +extern const char szServiceName2_UnoMultiPageControl[]; +extern const char szServiceName2_UnoMultiPageModel[]; +extern const char szServiceName2_UnoPageControl[]; +extern const char szServiceName2_UnoPageModel[]; +extern const char szServiceName2_UnoFrameControl[]; +extern const char szServiceName2_UnoFrameModel[]; +extern const char szServiceName_TabController[], szServiceName2_TabController[]; +extern const char szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[]; +extern const char szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[]; +extern const char szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[]; +extern const char szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[]; +extern const char szServiceName_UnoControlEditModel[]; +extern const char szServiceName_UnoControlFileControl[]; +extern const char szServiceName_UnoControlFileControlModel[]; +extern const char szServiceName_UnoControlButton[]; +extern const char szServiceName_UnoControlButtonModel[]; +extern const char szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[]; +extern const char szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[]; +extern const char szServiceName_UnoControlImageControl[]; +extern const char szServiceName_UnoControlImageControlModel[]; +extern const char szServiceName_UnoControlRadioButton[]; +extern const char szServiceName_UnoControlRadioButtonModel[]; +extern const char szServiceName_UnoControlCheckBox[]; +extern const char szServiceName_UnoControlCheckBoxModel[]; +extern const char szServiceName_UnoControlListBox[]; +extern const char szServiceName_UnoControlListBoxModel[]; +extern const char szServiceName_UnoControlComboBox[]; +extern const char szServiceName_UnoControlComboBoxModel[]; +extern const char szServiceName_UnoControlFixedText[]; +extern const char szServiceName_UnoControlGroupBox[]; +extern const char szServiceName_UnoControlGroupBoxModel[]; +extern const char szServiceName_UnoControlDateField[]; +extern const char szServiceName_UnoControlDateFieldModel[]; +extern const char szServiceName_UnoControlTimeField[]; +extern const char szServiceName_UnoControlTimeFieldModel[]; +extern const char szServiceName_UnoControlNumericField[]; +extern const char szServiceName_UnoControlNumericFieldModel[]; +extern const char szServiceName_UnoControlCurrencyField[]; +extern const char szServiceName_UnoControlCurrencyFieldModel[]; +extern const char szServiceName_UnoControlPatternField[]; +extern const char szServiceName_UnoControlPatternFieldModel[]; +extern const char szServiceName_UnoControlFormattedField[]; +extern const char szServiceName_UnoControlFormattedFieldModel[]; +extern const char szServiceName_UnoControlProgressBar[]; +extern const char szServiceName_UnoControlProgressBarModel[]; +extern const char szServiceName_UnoControlScrollBar[]; +extern const char szServiceName_UnoControlScrollBarModel[]; +extern const char szServiceName_UnoControlFixedLine[]; +extern const char szServiceName_UnoControlFixedLineModel[]; +extern const char szServiceName_PrinterServer[], szServiceName2_PrinterServer[]; +extern const char szServiceName_UnoControlRoadmap[]; +extern const char szServiceName_UnoControlRoadmapModel[]; -extern const sal_Char szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[]; +extern const char szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[]; -extern const sal_Char szServiceName_GridControl[]; -extern const sal_Char szServiceName_DefaultGridDataModel[]; -extern const sal_Char szServiceName_DefaultGridColumnModel[]; -extern const sal_Char szServiceName_GridColumn[]; -extern const sal_Char szServiceName_SortableGridDataModel[]; +extern const char szServiceName_GridControl[]; +extern const char szServiceName_DefaultGridDataModel[]; +extern const char szServiceName_DefaultGridColumnModel[]; +extern const char szServiceName_GridColumn[]; +extern const char szServiceName_SortableGridDataModel[]; -extern const sal_Char szServiceName_AnimatedImagesControl[]; -extern const sal_Char szServiceName_AnimatedImagesControlModel[]; -extern const sal_Char szServiceName_SpinningProgressControlModel[]; +extern const char szServiceName_AnimatedImagesControl[]; +extern const char szServiceName_AnimatedImagesControlModel[]; +extern const char szServiceName_SpinningProgressControlModel[]; -extern const sal_Char szServiceName_UnoControlTabPageModel[], szServiceName2_UnoControlTabPageModel[]; -extern const sal_Char szServiceName_UnoControlTabPage[]; -extern const sal_Char szServiceName_UnoControlTabPageContainerModel[]; -extern const sal_Char szServiceName_UnoControlTabPageContainer[]; +extern const char szServiceName_UnoControlTabPageModel[], szServiceName2_UnoControlTabPageModel[]; +extern const char szServiceName_UnoControlTabPage[]; +extern const char szServiceName_UnoControlTabPageContainerModel[]; +extern const char szServiceName_UnoControlTabPageContainer[]; // ExtUnoWrapper: extern const char szServiceName_ImageProducer[], szServiceName2_ImageProducer[]; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 27ceb86b5462..a7a9078ad6b4 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -800,7 +800,7 @@ WindowType ImplGetComponentType( const OUString& rServiceName ) struct MessageBoxTypeInfo { css::awt::MessageBoxType const eType; - const sal_Char *pName; + const char *pName; sal_Int32 const nLen; }; diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 39614d0a5916..a47f04d8906e 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -197,7 +197,7 @@ namespace toolkit } - OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) + OUString OAccessibleControlContext::getModelStringProperty( const char* _pPropertyName ) { OUString sReturn; try diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 5cada204bc77..1b7365468d65 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -77,7 +77,7 @@ namespace toolkit } - void GridColumn::broadcast_changed( sal_Char const * const i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue, + void GridColumn::broadcast_changed( char const * const i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue, ::comphelper::ComponentGuard& i_Guard ) { Reference< XInterface > const xSource( static_cast< ::cppu::OWeakObject* >( this ) ); diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 077a491e5295..6ff9d4fe73df 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -89,14 +89,14 @@ public: private: void broadcast_changed( - sal_Char const * const i_asciiAttributeName, + char const * const i_asciiAttributeName, const css::uno::Any& i_oldValue, const css::uno::Any& i_newValue, ::comphelper::ComponentGuard& i_Guard ); template< class TYPE > - void impl_set( TYPE & io_attribute, TYPE const & i_newValue, sal_Char const * i_attributeName ) + void impl_set( TYPE & io_attribute, TYPE const & i_newValue, char const * i_attributeName ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( io_attribute == i_newValue ) diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index 94a802e631fb..c34f464c52da 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -20,78 +20,78 @@ #include <sal/types.h> #include <toolkit/helper/servicenames.hxx> -const sal_Char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit"; -const sal_Char szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit"; -const sal_Char szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu"; -const sal_Char szServiceName2_PopupMenu[] = "com.sun.star.awt.PopupMenu"; -const sal_Char szServiceName_MenuBar[] = "stardiv.vcl.MenuBar"; -const sal_Char szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar"; -const sal_Char szServiceName_Pointer[] = "stardiv.vcl.Pointer"; -const sal_Char szServiceName2_Pointer[] = "com.sun.star.awt.Pointer"; -const sal_Char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer"; -const sal_Char szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer"; -const sal_Char szServiceName_TabController[] = "stardiv.vcl.control.TabController"; -const sal_Char szServiceName2_TabController[] = "com.sun.star.awt.TabController"; -const sal_Char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController"; -const sal_Char szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel"; -const sal_Char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog"; -const sal_Char szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog"; -const sal_Char szServiceName_UnoControlDialogModel[] = "stardiv.vcl.controlmodel.Dialog"; -const sal_Char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoControlDialogModel"; -const sal_Char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit"; -const sal_Char szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit"; -const sal_Char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit"; -const sal_Char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl"; -const sal_Char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl"; -const sal_Char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button"; -const sal_Char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button"; -const sal_Char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton"; -const sal_Char szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton"; -const sal_Char szServiceName_UnoControlImageButtonModel[] = "stardiv.vcl.controlmodel.ImageButton"; -const sal_Char szServiceName2_UnoControlImageButtonModel[] = "com.sun.star.awt.UnoControlImageButtonModel"; -const sal_Char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl"; -const sal_Char szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl"; -const sal_Char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton"; -const sal_Char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton"; -const sal_Char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox"; -const sal_Char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox"; -const sal_Char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox"; -const sal_Char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox"; -const sal_Char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox"; -const sal_Char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox"; -const sal_Char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText"; -const sal_Char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox"; -const sal_Char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox"; -const sal_Char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField"; -const sal_Char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField"; -const sal_Char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField"; -const sal_Char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField"; -const sal_Char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField"; -const sal_Char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField"; -const sal_Char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField"; -const sal_Char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField"; -const sal_Char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField"; -const sal_Char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField"; -const sal_Char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField"; -const sal_Char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField"; -const sal_Char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection"; -const sal_Char szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection"; -const sal_Char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer"; -const sal_Char szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer"; -const sal_Char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar"; -const sal_Char szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar"; -const sal_Char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar"; -const sal_Char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar"; -const sal_Char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine"; -const sal_Char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine"; -const sal_Char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap"; -const sal_Char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap"; -const sal_Char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton"; -const sal_Char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; -const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; -const sal_Char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel"; -const sal_Char szServiceName_DefaultGridColumnModel[] = "com.sun.star.awt.grid.DefaultGridColumnModel"; -const sal_Char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn"; -const sal_Char szServiceName_SortableGridDataModel[] = "com.sun.star.awt.grid.SortableGridDataModel"; +const char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit"; +const char szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit"; +const char szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu"; +const char szServiceName2_PopupMenu[] = "com.sun.star.awt.PopupMenu"; +const char szServiceName_MenuBar[] = "stardiv.vcl.MenuBar"; +const char szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar"; +const char szServiceName_Pointer[] = "stardiv.vcl.Pointer"; +const char szServiceName2_Pointer[] = "com.sun.star.awt.Pointer"; +const char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer"; +const char szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer"; +const char szServiceName_TabController[] = "stardiv.vcl.control.TabController"; +const char szServiceName2_TabController[] = "com.sun.star.awt.TabController"; +const char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController"; +const char szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel"; +const char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog"; +const char szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog"; +const char szServiceName_UnoControlDialogModel[] = "stardiv.vcl.controlmodel.Dialog"; +const char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoControlDialogModel"; +const char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit"; +const char szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit"; +const char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit"; +const char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl"; +const char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl"; +const char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button"; +const char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button"; +const char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton"; +const char szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton"; +const char szServiceName_UnoControlImageButtonModel[] = "stardiv.vcl.controlmodel.ImageButton"; +const char szServiceName2_UnoControlImageButtonModel[] = "com.sun.star.awt.UnoControlImageButtonModel"; +const char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl"; +const char szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl"; +const char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton"; +const char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton"; +const char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox"; +const char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox"; +const char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox"; +const char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox"; +const char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox"; +const char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox"; +const char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText"; +const char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox"; +const char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox"; +const char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField"; +const char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField"; +const char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField"; +const char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField"; +const char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField"; +const char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField"; +const char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField"; +const char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField"; +const char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField"; +const char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField"; +const char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField"; +const char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField"; +const char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection"; +const char szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection"; +const char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer"; +const char szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer"; +const char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar"; +const char szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar"; +const char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar"; +const char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar"; +const char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine"; +const char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine"; +const char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap"; +const char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap"; +const char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton"; +const char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; +const char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; +const char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel"; +const char szServiceName_DefaultGridColumnModel[] = "com.sun.star.awt.grid.DefaultGridColumnModel"; +const char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn"; +const char szServiceName_SortableGridDataModel[] = "com.sun.star.awt.grid.SortableGridDataModel"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
