Kaydet (Commit) 1ae4c873 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

char[] -> const char[].

üst 34592de6
...@@ -3402,17 +3402,12 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig ...@@ -3402,17 +3402,12 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
{ {
SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell(); SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell();
char aNum[] = "private:resource/toolbar/custom_OOo1x_0"; rtl::OUString aNum( "private:resource/toolbar/custom_OOo1x_" );
char aTitle[] = "Toolbar 0"; rtl::OUString aTitle( "Toolbar " );
sal_Int32 nNumIndex = strlen( aNum )-1;
sal_Int32 nTitleIndex = strlen( aTitle )-1;
for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ ) for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ )
{ {
aNum[nNumIndex]++; rtl::OUString aCustomTbxName = aNum + rtl::OUString::valueOf( i + 1 );
aTitle[nTitleIndex]++; rtl::OUString aCustomTbxTitle = aTitle + rtl::OUString::valueOf( i + 1 );
rtl::OUString aCustomTbxName( RTL_CONSTASCII_USTRINGPARAM( aNum ));
rtl::OUString aCustomTbxTitle( RTL_CONSTASCII_USTRINGPARAM( aTitle ));
uno::Reference< container::XIndexContainer > xToolbar = rToolbars[i]; uno::Reference< container::XIndexContainer > xToolbar = rToolbars[i];
ConvertSlotsToCommands( pObjShell, xToolbar ); ConvertSlotsToCommands( pObjShell, xToolbar );
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ) #define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE )
#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE ) #define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE )
sal_Char XMLN_BLOCKLIST[] = "BlockList.xml"; const char XMLN_BLOCKLIST[] = "BlockList.xml";
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
......
...@@ -48,7 +48,7 @@ using ::rtl::OUString; ...@@ -48,7 +48,7 @@ using ::rtl::OUString;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml"; const char XMLN_VERSIONSLIST[] = "VersionList.xml";
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// #110897# // #110897#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment