summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx6
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx12
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx6
-rw-r--r--sfx2/source/view/viewfac.cxx2
6 files changed, 15 insertions, 15 deletions
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index fbf452065520..5a42eadc8f2b 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -295,7 +295,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
default:
{
- const sal_Char* p = static_cast<sal_Char const *>(pData->getData());
+ const char* p = static_cast<char const *>(pData->getData());
long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : pData->getSize();
Sequence< sal_Int8 > aSeq( reinterpret_cast<const sal_Int8*>(p), nLen );
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index c1641582934f..850dd0badc88 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -30,9 +30,9 @@
#include <sfx2/fcontnr.hxx>
#include <sfxtypes.hxx>
-static sal_Char const sHTML_SC_yes[] = "YES";
-static sal_Char const sHTML_SC_no[] = "NO";
-static sal_Char const sHTML_SC_auto[] = "AUTO";
+static char const sHTML_SC_yes[] = "YES";
+static char const sHTML_SC_no[] = "NO";
+static char const sHTML_SC_auto[] = "AUTO";
static HTMLOptionEnum<ScrollingMode> const aScrollingTable[] =
{
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 10eb16a0c815..3c7db9c95232 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -53,11 +53,11 @@
using namespace ::com::sun::star;
-static sal_Char const sHTML_SC_yes[] = "YES";
-static sal_Char const sHTML_SC_no[] = "NO";
+static char const sHTML_SC_yes[] = "YES";
+static char const sHTML_SC_no[] = "NO";
void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
- const sal_Char *pIndent,
+ const char *pIndent,
const OUString& rName,
const OUString& rContent,
bool bHTTPEquiv,
@@ -83,11 +83,11 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
const uno::Reference<document::XDocumentProperties> & i_xDocProps,
- const sal_Char *pIndent,
+ const char *pIndent,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars )
{
- const sal_Char *pCharSet =
+ const char *pCharSet =
rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
if( pCharSet )
@@ -287,7 +287,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
aAny = xSet->getPropertyValue("FrameIsScrollingMode");
if ( aAny >>= bVal )
{
- const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
+ const char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_scrolling)
.append(pStr);
}
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index bec98c57b486..1ae7996f2993 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -526,7 +526,7 @@ void UsageInfo::save()
osl_getLocalTimeFromSystemTime( &systemTime, &localTime );
osl_getDateTimeFromTimeValue( &localTime, &localDateTime );
- sal_Char time[1024];
+ char time[1024];
sprintf(time,"%4i-%02i-%02iT%02i_%02i_%02i", localDateTime.Year, localDateTime.Month, localDateTime.Day, localDateTime.Hours, localDateTime.Minutes, localDateTime.Seconds);
//filename type: usage-YYYY-MM-DDTHH_MM_SS.csv
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index b9d072d27012..0eaa44115f07 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1003,7 +1003,7 @@ void SfxDocumentMetaData::updateUserDefinedAndAttributes()
"office:target-frame-name",
m_DefaultTarget);
// xlink:show: _blank -> new, any other value -> replace
- const sal_Char* show = m_DefaultTarget == "_blank" ? "new" : "replace";
+ const char* show = m_DefaultTarget == "_blank" ? "new" : "replace";
attributes.emplace_back(
"xlink:show",
OUString::createFromAscii(show));
@@ -1750,7 +1750,7 @@ SfxDocumentMetaData::loadFromStorage(
sal_uInt64 version = SotStorage::GetVersion( xStorage );
// Oasis is also the default (0)
bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 );
- const sal_Char *pServiceName = bOasis
+ const char *pServiceName = bOasis
? "com.sun.star.document.XMLOasisMetaImporter"
: "com.sun.star.document.XMLMetaImporter";
@@ -1834,7 +1834,7 @@ SfxDocumentMetaData::storeToStorage(
const sal_uInt64 version = SotStorage::GetVersion( xStorage );
// Oasis is also the default (0)
const bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 );
- const sal_Char *pServiceName = bOasis
+ const char *pServiceName = bOasis
? "com.sun.star.document.XMLOasisMetaExporter"
: "com.sun.star.document.XMLMetaExporter";
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index c3e98aefe27c..61cadd48053f 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -47,7 +47,7 @@ OUString SfxViewFactory::GetAPIViewName() const
// CTOR / DTOR -----------------------------------------------------------
SfxViewFactory::SfxViewFactory( SfxViewCtor fnC,
- SfxInterfaceId nOrdinal, const sal_Char* asciiViewName ):
+ SfxInterfaceId nOrdinal, const char* asciiViewName ):
fnCreate(fnC),
nOrd(nOrdinal),
m_sViewName( OUString::createFromAscii( asciiViewName ) )
generated by cgit (git 2.34.1) at 2024-07-14 04:43:56 +0000