diff options
21 files changed, 30 insertions, 30 deletions
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index 020b454cce87..3d4623de2812 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -48,7 +48,7 @@ namespace sdr // basic constructor, used from SdrPageView. explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow, - const sal_Char *pDebugName); + const char *pDebugName); virtual ~ObjectContactOfPageView() override; // LazyInvalidate request. This is used from the VOCs to mark that they diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index d49aad3c7c60..90fa7700a54a 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -69,7 +69,7 @@ namespace svx class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider { public: - PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName ) + PropertyValueProvider( ::cppu::OWeakObject& _rContext, const char* _pAsciiPropertyName ) :m_rContext( _rContext ) ,m_sPropertyName( OUString::createFromAscii( _pAsciiPropertyName ) ) { diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 6712c79fafc0..e59c2bbb4825 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -240,7 +240,7 @@ public: // and to create own derivations of ObjectContact virtual sdr::contact::ObjectContact* createViewSpecificObjectContact( SdrPageWindow& rPageWindow, - const sal_Char* pDebugName) const; + const char* pDebugName) const; }; // First of all the app creates a SdrModel. diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index f1550728151f..9f92a93ae909 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -731,7 +731,7 @@ public: // FUNCTION PARSER -typedef const sal_Char* StringIteratorT; +typedef const char* StringIteratorT; struct ParserContext { diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index 8cd9089c7051..e6ee8b699dbc 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -75,7 +75,7 @@ Color HexColorControl::GetColor() const if (nLen < 7) { - static const sal_Char* const pNullStr = "000000"; + static const char* const pNullStr = "000000"; aStr += OUString::createFromAscii( &pNullStr[nLen-1] ); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 94fddca18f8a..f8224e3d75b8 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -60,11 +60,11 @@ SFX_IMPL_CHILDWINDOW(SvxRubyChildWindow, SID_RUBY_DIALOG); namespace { -static const sal_Char cRubyBaseText[] = "RubyBaseText"; -static const sal_Char cRubyText[] = "RubyText"; -static const sal_Char cRubyAdjust[] = "RubyAdjust"; -static const sal_Char cRubyPosition[] = "RubyPosition"; -static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; +static const char cRubyBaseText[] = "RubyBaseText"; +static const char cRubyText[] = "RubyText"; +static const char cRubyAdjust[] = "RubyAdjust"; +static const char cRubyPosition[] = "RubyPosition"; +static const char cRubyCharStyleName[] = "RubyCharStyleName"; } // end anonymous namespace diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 5fcea4b7d6bc..999b482625f2 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -144,7 +144,7 @@ namespace svxform // depending on this script type, use the right property from the document's style which controls the // default locale for document content - const sal_Char* pCharLocalePropertyName = "CharLocale"; + const char* pCharLocalePropertyName = "CharLocale"; switch ( eSysLocaleScriptType ) { case ScriptType::LATIN: diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index 6bcb8a0b1bfc..72974e70f0d8 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -79,7 +79,7 @@ namespace svxform struct ModuleInfo { - const sal_Char* pAsciiModuleOrServiceName; + const char* pAsciiModuleOrServiceName; DocumentType const eType; }; diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 2a543178b571..e2a0492363c2 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -78,7 +78,7 @@ namespace svxform struct Ascii2Int16 { - const sal_Char* pAscii; + const char* pAscii; sal_Int16 const nValue; }; @@ -126,7 +126,7 @@ namespace svxform return -1; } - static const sal_Char* lcl_implMapIntValue( const sal_Int16 _nValue, const Ascii2Int16* _pMap ) + static const char* lcl_implMapIntValue( const sal_Int16 _nValue, const Ascii2Int16* _pMap ) { // search the map for the given integer value const Ascii2Int16* pSearch = _pMap; @@ -140,7 +140,7 @@ namespace svxform SAL_WARN( "svx", "lcl_implMapIntValue: could not convert the integer value " << _nValue << " !"); - static const sal_Char* const s_pDummy = ""; + static const char* const s_pDummy = ""; // just as a fallback... return s_pDummy; } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a828a55c7b82..6e609ad84a9f 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -416,7 +416,7 @@ namespace svx SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); - const sal_Char* pAsciiUnoName = nullptr; + const char* pAsciiUnoName = nullptr; if ( pSlot ) { pAsciiUnoName = pSlot->GetUnoName(); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 8ed702b4a4e0..540816d79459 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard, void*, void ) DBG_UNHANDLED_EXCEPTION("svx"); } - const sal_Char* pWizardAsciiName = nullptr; + const char* pWizardAsciiName = nullptr; switch ( nClassId ) { case FormComponentType::GRIDCONTROL: diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 5f7cbedef8f4..32b5d31fb232 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -220,7 +220,7 @@ namespace svxform } - static const sal_Char* aCharacterAndParagraphProperties[] = + static const char* aCharacterAndParagraphProperties[] = { "CharFontName", "CharFontStyleName", @@ -363,7 +363,7 @@ namespace svxform Reference< XPropertySetInfo > xDestPropInfo( _rxModel->getPropertySetInfo(), UNO_SET_THROW ); OUString sPropertyName; - const sal_Char** pCharacterProperty = aCharacterAndParagraphProperties; + const char** pCharacterProperty = aCharacterAndParagraphProperties; while ( *pCharacterProperty ) { sPropertyName = OUString::createFromAscii( *pCharacterProperty ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index ee91ac4ee9bd..6ca4c6941e3b 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -243,7 +243,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat INetURLObject aInfoFileURL( GetParent()->GetUserURL() ); INetURLObject aNewURL; sal_uInt32 nNextNumber = 1999; - sal_Char const* pExt = nullptr; + char const* pExt = nullptr; bool bExists; aDir.Append( "dragdrop" ); diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 5838a1610e0f..de81b46fe5f4 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -56,7 +56,7 @@ namespace sdr } ObjectContactOfPageView::ObjectContactOfPageView( - SdrPageWindow& rPageWindow, const sal_Char *pDebugName) + SdrPageWindow& rPageWindow, const char *pDebugName) : ObjectContact() , Idle(pDebugName) , mrPageWindow(rPageWindow) diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index b83732f51b30..da810390717a 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -53,7 +53,7 @@ namespace { // The style family which is appended to the style names is padded to this many characters. const short PADDING_LENGTH_FOR_STYLE_FAMILY = 5; // this character will be used to pad the style families when they are appended to the style names -const sal_Char PADDING_CHARACTER_FOR_STYLE_FAMILY = ' '; +const char PADDING_CHARACTER_FOR_STYLE_FAMILY = ' '; } bool SdrTextObj::AdjustTextFrameWidthAndHeight( tools::Rectangle& rR, bool bHgt, bool bWdt ) const diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index b7a74e21b4fd..bb1a8564d654 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1458,7 +1458,7 @@ void SdrView::SetMasterPagePaintCaching(bool bOn) // Default ObjectContact is ObjectContactOfPageView sdr::contact::ObjectContact* SdrView::createViewSpecificObjectContact( SdrPageWindow& rPageWindow, - const sal_Char* pDebugName) const + const char* pDebugName) const { return new sdr::contact::ObjectContactOfPageView(rPageWindow, pDebugName); } diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 3bcba8d8e0cf..732fadfea100 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -204,7 +204,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) const SvxPostureItem& rPostureItem = rCellSet.Get( EE_CHAR_ITALIC ); const SvxUnderlineItem& rUnderlineItem = rCellSet.Get( EE_CHAR_UNDERLINE ); - const sal_Char* pChar; + const char* pChar; switch( eHAdj ) { diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index fe9b27de95c5..98e69dc2423f 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/svx/source/tbxctrls/Palette.cxx @@ -94,7 +94,7 @@ void PaletteASE::LoadPalette() aFile.SetEndian(SvStreamEndian::BIG); // Verify magic first 4 characters - sal_Char cMagic[5] = {0}; + char cMagic[5] = {0}; if ((aFile.ReadBytes(cMagic, 4) != 4) || (strncmp(cMagic, "ASEF", 4) != 0)) { mbValidPalette = false; @@ -136,7 +136,7 @@ void PaletteASE::LoadPalette() continue; } - sal_Char cColorModel[5] = {0}; + char cColorModel[5] = {0}; aFile.ReadBytes(cColorModel, 4); OString aColorModel(cColorModel); // r, g, and b are floats ranging from 0 to 1 diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index f1830385a87f..3ab6b7cc12e3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2908,7 +2908,7 @@ struct SvxStyleToolBoxControl::Impl bSpecModeCalc = xServices->supportsService( "com.sun.star.sheet.SpreadsheetDocument"))) { - static const sal_Char* aCalcStyles[] = + static const char* aCalcStyles[] = { "Default", "Heading1", diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index edaf9076b6d4..9dd1229de58d 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -38,7 +38,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * textconversiondlgs_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries_unodialogs_chinesetranslation ); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 688fd1b29ee6..4c3a1bcbd963 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -593,10 +593,10 @@ void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel > static struct { - const sal_Char* mpAPIName; + const char* mpAPIName; sal_uInt16 const mnAPINameLen; - const sal_Char* mpFormName; + const char* mpFormName; sal_uInt16 const mnFormNameLen; } const SvxShapeControlPropertyMapping[] = |