summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 17:01:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 18:04:41 +0100
commit8b550895b3007eecfbcf02573d8eb5ed57a45c62 (patch)
tree4d9245a7b96276df37fd8ca58fdd9efa490404da /starmath
parent011dae60e2170f71ddf647d5ea2b844432480dc7 (diff)
sal_Char->char in sot..store
Change-Id: Ia133c1a7549d81f2e88e34ab7e6c9ea578c745ae Reviewed-on: https://gerrit.libreoffice.org/85702 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/token.hxx4
-rw-r--r--starmath/source/mathmlexport.cxx8
-rw-r--r--starmath/source/mathmlexport.hxx6
-rw-r--r--starmath/source/mathmlimport.cxx8
-rw-r--r--starmath/source/mathmlimport.hxx8
-rw-r--r--starmath/source/mathtype.cxx2
-rw-r--r--starmath/source/parse.cxx4
-rw-r--r--starmath/source/register.cxx2
-rw-r--r--starmath/visual-editor-todo2
9 files changed, 22 insertions, 22 deletions
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 8abe85e61858..786b4ff31d75 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -121,14 +121,14 @@ struct SmToken
SmToken();
SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
- const sal_Char* pText,
+ const char* pText,
TG nTokenGroup = TG::NONE,
sal_uInt16 nTokenLevel = 0);
};
struct SmTokenTableEntry
{
- const sal_Char* pIdent;
+ const char* pIdent;
SmTokenType const eType;
sal_Unicode const cMathChar;
TG const nGroup;
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index bfeab01c6284..6a8120c605a1 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -248,7 +248,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
const Reference<XComponent>& xComponent,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pComponentName )
+ const char* pComponentName )
{
OSL_ENSURE(xOutputStream.is(), "I really need an output stream!");
OSL_ENSURE(xComponent.is(), "Need component!");
@@ -292,10 +292,10 @@ bool SmXMLExportWrapper::WriteThroughComponent(
bool SmXMLExportWrapper::WriteThroughComponent(
const Reference < embed::XStorage >& xStorage,
const Reference<XComponent>& xComponent,
- const sal_Char* pStreamName,
+ const char* pStreamName,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pComponentName
+ const char* pComponentName
)
{
OSL_ENSURE(xStorage.is(), "Need storage!");
@@ -1291,7 +1291,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
// nBold: -1 = yet undefined; 0 = false; 1 = true;
// nItalic: -1 = yet undefined; 0 = false; 1 = true;
// nSansSerifFixed: -1 = undefined; 0 = sans; 1 = serif; 2 = fixed;
- const sal_Char *pText = "normal";
+ const char *pText = "normal";
if (nSansSerifFixed == -1 || nSansSerifFixed == 1)
{
pText = "normal";
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 72ce800ad3af..dda259310b78 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -51,15 +51,15 @@ public:
const css::uno::Reference< css::lang::XComponent >& xComponent,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pComponentName );
+ const char* pComponentName );
static bool WriteThroughComponent(
const css::uno::Reference< css::embed::XStorage >& xStor,
const css::uno::Reference< css::lang::XComponent >& xComponent,
- const sal_Char* pStreamName,
+ const char* pStreamName,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pComponentName );
+ const char* pComponentName );
};
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 18cf0e3b7ca6..9970e34dd3bc 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -250,7 +250,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
const Reference<XComponent>& xModelComponent,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pFilterName,
+ const char* pFilterName,
bool bEncrypted )
{
ErrCode nError = ERRCODE_SFX_DOLOADFAILED;
@@ -350,11 +350,11 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
ErrCode SmXMLImportWrapper::ReadThroughComponent(
const uno::Reference< embed::XStorage >& xStorage,
const Reference<XComponent>& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pFilterName )
+ const char* pFilterName )
{
OSL_ENSURE(xStorage.is(), "Need storage!");
OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!");
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 2357c9f09bf9..71444a86ad04 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -51,17 +51,17 @@ public:
const css::uno::Reference< css::lang::XComponent >& xModelComponent,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pFilterName,
+ const char* pFilterName,
bool bEncrypted );
static ErrCode ReadThroughComponent(
const css::uno::Reference< css::embed::XStorage >& xStorage,
const css::uno::Reference< css::lang::XComponent >& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pFilterName );
+ const char* pFilterName );
};
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index cd33f289dda7..06655e112597 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1703,7 +1703,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
// read font name
while(true)
{
- sal_Char nChar8(0);
+ char nChar8(0);
pS->ReadChar( nChar8 );
if (nChar8 == 0)
break;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5fc391a86982..4e3b8172ca41 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -51,7 +51,7 @@ SmToken::SmToken()
SmToken::SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
- const sal_Char* pText,
+ const char* pText,
TG nTokenGroup,
sal_uInt16 nTokenLevel)
: aText(OUString::createFromAscii(pText))
@@ -1644,7 +1644,7 @@ std::unique_ptr<SmNode> SmParser::DoOper()
case TLIMSUP :
case TLIMINF :
{
- const sal_Char* pLim = nullptr;
+ const char* pLim = nullptr;
switch (eType)
{
case TLIM : pLim = "lim"; break;
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 304fb8fba2fa..89f7c2dd325a 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/visual-editor-todo b/starmath/visual-editor-todo
index f378d2db6940..04dedae01699 100644
--- a/starmath/visual-editor-todo
+++ b/starmath/visual-editor-todo
@@ -12,7 +12,7 @@ on IRC (jopsen) or e-mail me at jopsen@gmail.com.
Easy
----
-1. SmGraphicWindow::KeyInput relies on comparison of sal_Char, a better way must be available for CTRL+c
+1. SmGraphicWindow::KeyInput relies on comparison of char, a better way must be available for CTRL+c
2. Code style (missing spaces, linebreaks and a few renames)
3. More documentation
4. Remove the CreateTextFromNode methods and replace calls to it with NodeToTextVisitor