[Libreoffice-commits] .: 2 commits - cui/source cui/util sw/source

[Libreoffice Gerrit user]

 cui/source/inc/helpid.hrc       |    1 -
 cui/util/hidother.src           |    1 -
 sw/source/filter/ww8/ww8par.cxx |    6 +++---
 sw/source/filter/ww8/ww8par.hxx |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit e2250ec113e5534875e7480f5bf508d71fa46f4d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 25 16:54:30 2013 +0000

    remove unused hids
    
    Change-Id: Iab2d62506c3985bd3f32e8140057ec136cfd3395

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c1ab0c6..c783861 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -284,7 +284,6 @@
 #define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT"
 #define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
 #define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
-#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
 #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
 #define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
 #define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index 53f1303..a1896da 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -172,7 +172,6 @@ hidspecial HID_TPCOLOR_CMYK_3               { HelpID = HID_TPCOLOR_CMYK_3; };
 hidspecial HID_TPCOLOR_RGB_1                { HelpID = HID_TPCOLOR_RGB_1; };
 hidspecial HID_TPCOLOR_RGB_2                { HelpID = HID_TPCOLOR_RGB_2; };
 hidspecial HID_TPCOLOR_RGB_3                { HelpID = HID_TPCOLOR_RGB_3; };
-hidspecial HID_VALUESET_NUMBMP              { HelpID = HID_VALUESET_NUMBMP   ;};
 hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICATE ;};
 hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK         { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
 hidspecial UID_SEARCH_RECORDSTATUS          { HelpID = UID_SEARCH_RECORDSTATUS ;};
commit 963fb917d777f28190d9674e6943ebb5436f435b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 25 16:48:40 2013 +0000

    fix build, change overridden GetOLEStorageName to OUString
    
    Change-Id: I333090ae95218cd3438a8eb8b67ea9f07174ca8f

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index acfecb2..6cabcbd 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -303,7 +303,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
     }
 
     SdrObject* pRet = 0;
-    String sStorageName;
+    OUString sStorageName;
     SotStorageRef xSrcStg;
     uno::Reference < embed::XStorage > xDstStg;
     if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
@@ -5654,7 +5654,7 @@ sal_Bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, sal_Bool bSaveRelFiles
     return bRet ? true : false;
 }
 
-sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName,
+sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
     SvStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const
 {
     bool bRet = false;
@@ -5726,7 +5726,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName,
 
     if( bRet )
     {
-        rStorageName = '_';
+        rStorageName = OUString('_');
         rStorageName += rtl::OUString::valueOf(nPictureId);
         rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString(
             SL::aObjectPool));
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 485cc34..8ff035e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -659,7 +659,7 @@ private:
     SvStream *pFallbackStream;
     std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache;
 
-    virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName,
+    virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
         SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const;
     virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const;
     // #i32596# - new parameter <_nCalledByGroup>, which