[Libreoffice-commits] .: sfx2/source sw/source xmloff/source

[Jan Holesovsky]

 sfx2/source/doc/sfxbasemodel.cxx        |   13 ++++---------
 sw/source/core/swg/SwXMLTextBlocks1.cxx |    2 +-
 xmloff/source/meta/xmlversion.cxx       |    2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 1ae4c87367d1719a100b61eb694a7a186d2e8d6b
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Apr 10 12:40:00 2012 +0200

    char[] -> const char[].

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5ec029e..02a4b9a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3402,17 +3402,12 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
                     {
                         SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell();
 
-                        char aNum[]   = "private:resource/toolbar/custom_OOo1x_0";
-                        char aTitle[] = "Toolbar 0";
-                        sal_Int32 nNumIndex = strlen( aNum )-1;
-                        sal_Int32 nTitleIndex = strlen( aTitle )-1;
+                        rtl::OUString aNum( "private:resource/toolbar/custom_OOo1x_" );
+                        rtl::OUString aTitle( "Toolbar " );
                         for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ )
                         {
-                            aNum[nNumIndex]++;
-                            aTitle[nTitleIndex]++;
-
-                            rtl::OUString aCustomTbxName( RTL_CONSTASCII_USTRINGPARAM( aNum ));
-                            rtl::OUString aCustomTbxTitle( RTL_CONSTASCII_USTRINGPARAM( aTitle ));
+                            rtl::OUString aCustomTbxName = aNum + rtl::OUString::valueOf( i + 1 );
+                            rtl::OUString aCustomTbxTitle = aTitle + rtl::OUString::valueOf( i + 1 );
 
                             uno::Reference< container::XIndexContainer > xToolbar = rToolbars[i];
                             ConvertSlotsToCommands( pObjShell, xToolbar );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 62a2494..3a20eb8 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -50,7 +50,7 @@
 #define STREAM_STGREAD  ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE )
 #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::uno;
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 9b2cb9d..3940fdd 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
 
 // ------------------------------------------------------------------------
 
-sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml";
+const char XMLN_VERSIONSLIST[] = "VersionList.xml";
 
 // ------------------------------------------------------------------------
 // #110897#