[PATCH] String cleanup in filter
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/1970 to look at the new patch set (#8). Change subject: String cleanup in filter .. String cleanup in filter Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd --- M filter/inc/filter/msfilter/svdfppt.hxx M filter/source/msfilter/svdfppt.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/filter/ppt/propread.cxx M sd/source/filter/ppt/propread.hxx 5 files changed, 117 insertions(+), 117 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1970/8 -- To view, visit https://gerrit.libreoffice.org/1970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String cleanup in filter
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/1970 to look at the new rebased patch set (#7). Change subject: String cleanup in filter .. String cleanup in filter Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd --- M filter/inc/filter/msfilter/svdfppt.hxx M filter/source/msfilter/svdfppt.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/filter/ppt/propread.cxx M sd/source/filter/ppt/propread.hxx 5 files changed, 117 insertions(+), 117 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1970/7 -- To view, visit https://gerrit.libreoffice.org/1970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String cleanup in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1970
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1970/1
String cleanup in filter
Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd
---
M filter/inc/filter/msfilter/svdfppt.hxx
M filter/source/msfilter/svdfppt.cxx
2 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index 79272f5..fcc704f 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -63,7 +63,7 @@
sal_uInt16 nDocFileVersion;
sal_uInt8 nMajorVersion;
sal_uInt8 nMinorVersion;
-String aCurrentUser;
+OUStringaCurrentUser;
public:
@@ -92,13 +92,13 @@
sal_Int32 nPrivate2;
sal_Int32 nPrivate3;
sal_Int32 nInfo;
-String aTarget;
-String aSubAdress;
+OUStringaTarget;
+OUStringaSubAdress;
sal_Int32 nStartPos;
sal_Int32 nEndPos;
-String aConvSubString;
+OUStringaConvSubString;
ESelection aESelection;
sal_BoolbSelection;
};
@@ -260,7 +260,7 @@
struct PptFontEntityAtom
{
-String aName;
+OUStringaName;
double fScaling;
sal_uInt8 lfClipPrecision;
sal_uInt8 lfQuality;
@@ -416,7 +416,7 @@
sal_BoolbTimesNewRomanChecked : 1;
sal_BoolbTimesNewRomanAvailable : 1;
-sal_BoolReadString( rtl::OUString rStr ) const;
+sal_BoolReadString( OUString rStr ) const;
// nur fuer PowerPoint-Filter:
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const;
@@ -425,7 +425,7 @@
PowerPointImportParam rImportParam;
-SdrEscherImport( PowerPointImportParam, const String
rBaseURL );
+SdrEscherImport( PowerPointImportParam, const
OUString rBaseURL );
virtual ~SdrEscherImport();
virtual boolGetColorFromPalette( sal_uInt16 nNum, Color rColor )
const;
virtual sal_BoolSeekToShape( SvStream rSt, void* pClientData,
sal_uInt32 nId ) const;
@@ -453,7 +453,7 @@
sal_uInt16 nTextRangeEnd;
SvxFieldItem* pField1;
SvxFieldItem* pField2;
-String* pString;
+OUString* pString;
PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2(
NULL ), pString( NULL ) {};
~PPTFieldEntry();
@@ -471,7 +471,7 @@
struct MSFILTER_DLLPUBLIC HeaderFooterEntry
{
const PptSlidePersistEntry* pMasterPersist;
-String pPlaceholder[ 4 ];
+OUStringpPlaceholder[ 4 ];
sal_uInt32 nAtom;
sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance );
@@ -575,7 +575,7 @@
voidSeekOle( SfxObjectShell* pShell, sal_uInt32
nFilterOptions );
public:
-SdrPowerPointImport( PowerPointImportParam, const
String rBaseURL );
+SdrPowerPointImport( PowerPointImportParam, const
OUString rBaseURL );
virtual ~SdrPowerPointImport();
sal_uInt16 GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE )
const;
voidSetPageNum( sal_uInt16 nPageNum, PptPageKind =
PPT_SLIDEPAGE );
@@ -916,7 +916,7 @@
sal_uInt32 mnOriginalTextPos;
sal_uInt32 mnParagraph;
-String maString;
+OUStringmaString;
SvxFieldItem* mpFieldItem;
sal_uInt16 mnLanguage[ 3 ];
@@ -1049,7 +1049,7 @@
SvStream rIn,
SdrPowerPointImport rMan,
const DffRecordHeader rTextHeader,
-const String aString,
+const OUString aString,
PPTTextRulerInterpreter rRuler,
sal_uInt32 nCharCount,
sal_Bool bTextPropAtom
@@ -1057,7 +1057,7 @@
voidReadCharProps(
SvStream rIn,
PPTCharPropSet aCharPropSet,
-const String aString,
+const OUString aString,
sal_uInt32 nCharCount,
sal_uInt32 nCharAnzRead,
sal_Bool bTextPropAtom,
@@ -1107,7 +1107,7 @@
sal_uInt32 nInstanceInSheet,
const PPTTextObj* pTextObj
);
-sal_uInt32 Count() const { return ( mpFieldItem ) ? 1 :
maString.Len(); };
+sal_uInt32 Count() const { return ( mpFieldItem ) ? 1 :
maString.getLength(); };
sal_BoolHasTabulator();
};
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 208d8b5..537e5f2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -437,7 +437,7 @@
[PATCH] String cleanup in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1848
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1848/1
String cleanup in filter
Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
---
M filter/inc/filter/msfilter/svxmsbas.hxx
M filter/source/msfilter/svxmsbas2.cxx
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx
b/filter/inc/filter/msfilter/svxmsbas.hxx
index 66df15e..8f87401 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -44,9 +44,9 @@
* probably what the user expects to see when viewing the code
*/
-typedef boost::unordered_map sal_Int32, String ObjIdToName;
+typedef boost::unordered_map sal_Int32, OUString ObjIdToName;
-typedef std::map String, ObjIdToName ControlAttributeInfo;
+typedef std::map OUString, ObjIdToName ControlAttributeInfo;
class MSFILTER_DLLPUBLIC SvxImportMSVBasic
{
@@ -58,13 +58,13 @@
// form the ObjectShell
// - returns a warning code if a modified basic exist, in all other
// cases return ERRCODE_NONE.
-sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const String
rStorageName );
+sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const OUString
rStorageName );
// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
// If it exist, then return the WarningId for loosing the information.
static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell rDocS );
-static String GetMSBasicStorageName();
+static OUString GetMSBasicStorageName();
private:
SotStorageRef xRoot;
SfxObjectShell rDocSh;
diff --git a/filter/source/msfilter/svxmsbas2.cxx
b/filter/source/msfilter/svxmsbas2.cxx
index d0b9d91..a1c4b8e 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -26,11 +26,11 @@
using namespace com::sun::star;
sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( sal_Bool bSaveInto,
-const String rStorageName )
+const OUString rStorageName )
{
sal_uLong nRet = ERRCODE_NONE;
uno::Reference embed::XStorage xSrcRoot( rDocSh.GetStorage() );
-String aDstStgName( GetMSBasicStorageName() );
+OUString aDstStgName( GetMSBasicStorageName() );
SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
STREAM_READWRITE | STREAM_NOCREATE |
STREAM_SHARE_DENYALL ) );
if( xVBAStg.Is() !xVBAStg-GetError() )
@@ -70,9 +70,9 @@
: ERRCODE_NONE;
}
-String SvxImportMSVBasic::GetMSBasicStorageName()
+OUString SvxImportMSVBasic::GetMSBasicStorageName()
{
-return String( RTL_CONSTASCII_USTRINGPARAM( _MS_VBA_Macros ) );
+return OUString( _MS_VBA_Macros );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
To view, visit https://gerrit.libreoffice.org/1848
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
