subject:"\[Libreoffice\-commits\] .\: lotuswordpro\/source"

[Libreoffice-commits] .: lotuswordpro/source

2012-12-30 Thread Libreoffice Gerrit user

 lotuswordpro/source/filter/lwpbackgroundstuff.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 3b1da9e650db388baa6d649219e2a0e45b58f062
Author: Radu Ioan 
Date:   Mon Dec 31 01:27:47 2012 +0200

fdo#39440 - cppcheck cleanliness

removed some cppcheck warning

Change-Id: I81963001e4737c583764b07bea9abf59a61dead7
Reviewed-on: https://gerrit.libreoffice.org/1518
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx 
b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index d26e0b3..a38d419 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -169,11 +169,8 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
 XFBGImage* pXFBGImage = new XFBGImage();
 pXFBGImage->SetImageData(pImageBuff, nSize);
 
-if (pImageBuff)
-{
-delete [] pImageBuff;
-pImageBuff = NULL;
-}
+delete [] pImageBuff;
+pImageBuff = NULL;
 
 
 pXFBGImage->SetRepeate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source sw/source

2012-11-06 Thread Libreoffice Gerrit user

 lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx |2 +-
 sw/source/core/doc/number.cxx  |2 --
 sw/source/core/text/inftxt.hxx |3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit dda117265966c44f36bcfd8979b7b5aa45318752
Author: jailletc36 
Date:   Sun Nov 4 16:57:29 2012 +0100

cppCheck: Various clean-up

xfdrawstyle.cxx: correct a copy/paste typo in constructor
number.cxx: remove an unused variable
inftxt.hxx: redundant assignment (pWrongList is assigned twice)

Change-Id: I148e23272ffa169ef16052c475e5f24a87383e5b
Signed-off-by: jailletc36 
Reviewed-on: https://gerrit.libreoffice.org/983
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx 
b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 5a6bf90..bd0fce2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -76,7 +76,7 @@ XFDrawStyle::XFDrawStyle()
 m_fArrowStartSize = 0.3;
 m_fArrowEndSize = 0.3;
 m_bArrowStartCenter = sal_False;
-m_bArrowStartCenter = sal_False;
+m_bArrowEndCenter = sal_False;
 }
 
 XFDrawStyle::~XFDrawStyle()
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index aa23a21..b6a71fe 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -773,7 +773,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& 
rNodeNum,
 String aPrevStr = MakeNumString( 
pWorkingNodeNum->GetNumberVector(),
  sal_True, sal_False, MAXLEVEL,
  &aExtremities);
-intnLen = aPrevStr.Len();
 intnStrip = 0;
 sal_Unicodec;
 
@@ -789,7 +788,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& 
rNodeNum,
 {
 aPrevStr.Erase( 0, nStrip );
 aExtremities.nPrefixChars -= nStrip;
-nLen -= nStrip;
 }
 
 if ((bFirstIteration || bOldHadPrefix) &&
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index c4cb8d7..d750eb3 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -404,7 +404,8 @@ protected:
 SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; 
pSmartTags = 0; pSpaceAdd = 0;
pBrushItem = ((SvxBrushItem*)-1);}
 #else
-SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; 
pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;}
+SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; 
pSmartTags = 0; pSpaceAdd = 0;
+   pBrushItem = 0;}
 #endif
 public:
 SwTxtPaintInfo( const SwTxtPaintInfo &rInf );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source

2012-10-09 Thread Libreoffice Gerrit user

 lotuswordpro/source/filter/lwpcharacterstyle.cxx |2 -
 lotuswordpro/source/filter/lwpfrib.cxx   |   44 ---
 lotuswordpro/source/filter/lwpfribheader.hxx |9 
 lotuswordpro/source/filter/lwplaypiece.hxx   |5 --
 lotuswordpro/source/filter/lwpobjtags.hxx|7 ---
 lotuswordpro/source/filter/lwpoverride.hxx   |5 --
 lotuswordpro/source/filter/tocread.cxx   |   10 -
 7 files changed, 1 insertion(+), 81 deletions(-)

New commits:
commit 24e66143ed0887bb28f359d3172735017434bdf8
Author: Marcos Paulo de Souza 
Date:   Fri Oct 5 20:33:57 2012 -0300

Remove useless code

These macros was never defined:
KANJI
AMIKAKE
BORDER_BMP
SMARTEXT
JAPANESE_ENABLED
BENUTIL_SUPPORT

So, these code inside these ifdefs was never executed. Remove all this.
Also in this commit, remove some odd comments and commented code.

Change-Id: Idd4991d06d1c879e64f07875241a8acfa35695d0
Signed-off-by: Marcos Paulo de Souza 
Reviewed-on: https://gerrit.libreoffice.org/777
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx 
b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 8b57de4..5c4de3f 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -124,7 +124,6 @@ void LwpTextStyle::ReadCommon()
 
 m_pLangOverride->Read(m_pObjStrm);
 m_pTxtAttrOverride->Read(m_pObjStrm);
-//#ifdef AMIKAKE
 if (LwpFileHeader::m_nFileRevision < 0x000B)
 {
 m_pCharacterBorderOverride->Read(m_pObjStrm);
@@ -135,7 +134,6 @@ void LwpTextStyle::ReadCommon()
 m_CharacterBorder.ReadIndexed(m_pObjStrm);
 m_Amikake.ReadIndexed(m_pObjStrm);
 }
-//#endif
 sal_uInt16 nCount = 6;
 if (LwpFileHeader::m_nFileRevision > 0x0005)
 nCount = m_pObjStrm->QuickReaduInt16();
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx 
b/lotuswordpro/source/filter/lwpfrib.cxx
index f7b800d..d801d42 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -169,36 +169,10 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, 
LwpObjectStream* pObjStrm, sal_uInt
 case FRIB_TAG_NOTE:
 newFrib = new  LwpFribNote(pPara);
 break;
-/*  case FRIB_TAG_KANJI:
-#ifdef KANJI
-newFrib = new CFribHelperKanji;
-#else
-newFrib = new CFribHelperUnicode;
-#endif
-break;
-case FRIB_TAG_HKATAKANA:
-#ifdef KANJI
-newFrib = new CFribHelperHKatakana;
-#else
-newFrib = new CFribHelperUnicode;
-#endif
-break;
-case FRIB_TAG_SEPARATOR:
-newFrib = new CFribHelperSeparator;
-break;*/
 case FRIB_TAG_SECTION:
 newFrib = new LwpFribSection(pPara);
 break;
-/*  case FRIB_TAG_TOMBSTONE:
-newFrib = new CFribHelperTombstone;
-break;
-case FRIB_TAG_SPECIALTAB:
-newFrib = new CFribHelperSpecialTab;
-break;
 case FRIB_TAG_PAGENUMBER:
-newFrib = new CFribHelperPageNumber;
-break;
-*/  case FRIB_TAG_PAGENUMBER:
 newFrib = new LwpFribPageNumber(pPara);
 break;
 case FRIB_TAG_DOCVAR:
@@ -207,30 +181,18 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, 
LwpObjectStream* pObjStrm, sal_uInt
 case FRIB_TAG_BOOKMARK:
 newFrib = new LwpFribBookMark(pPara);
 break;
-/*  case FRIB_TAG_DOCVAR:
-newFrib = new CFribHelperBookmark;
-break;
-case FRIB_TAG_DDE:
-newFrib = new CFribHelperDDE;
-break;
-*/  case FRIB_TAG_FIELD:
+case FRIB_TAG_FIELD:
 newFrib = new LwpFribField(pPara);
 break;
 case FRIB_TAG_CHBLOCK:
 newFrib = new LwpFribCHBlock(pPara);
 break;
-/*  case FRIB_TAG_FLOWBREAK:
-newFrib = new CFribHelperFlowBreak;
-break;
-#ifdef RUBY*/
 case FRIB_TAG_RUBYMARKER:
 newFrib = new LwpFribRubyMarker(pPara);
 break;
 case FRIB_TAG_RUBYFRAME:
 newFrib = new LwpFribRubyFrame(pPara);
 break;
-/*#endif
-*/
 }
 
 //Do not know why the fribTag judgement is necessary, to be checked with
@@ -400,10 +362,6 @@ void LwpFrib::ReadModifiers(LwpObjectStream* 
pObjStrm,ModifierInfo* pModInfo)
 }
 }
 
-//do nothing
-//void LwpFrib::Parse(IXFStream* pOutputStream)
-//{}
-
 /**
 *  @descr:   Whether there are other fribs following current frib.
 *  @return:  Ture if having following fribs, or false.
diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx 
b/lotuswordpro/source/filter/lwpfribheader.hxx
index 143799e..e6863a6 1006

[Libreoffice-commits] .: lotuswordpro/source

2012-10-02 Thread Libreoffice Gerrit user

 lotuswordpro/source/filter/bentoid.hxx |   17 -
 lotuswordpro/source/filter/lwpdoc.hxx  |9 -
 lotuswordpro/source/filter/lwpfribheader.hxx   |3 ---
 lotuswordpro/source/filter/lwpgrfobj.cxx   |   19 ++-
 lotuswordpro/source/filter/lwplayout.hxx   |   14 --
 lotuswordpro/source/filter/lwpoleobject.hxx|2 --
 lotuswordpro/source/filter/xfilter/xfframe.cxx |1 -
 7 files changed, 2 insertions(+), 63 deletions(-)

New commits:
commit 02a7bf55603d8b1e74b83bb2b02fa86e1e31807b
Author: Marcos Paulo de Souza 
Date:   Tue Oct 2 13:29:18 2012 -0300

Remove not used macros from lotusworkpro

Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0
Signed-off-by: Marcos Paulo de Souza 
Reviewed-on: https://gerrit.libreoffice.org/749
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/bentoid.hxx 
b/lotuswordpro/source/filter/bentoid.hxx
index 135b190..d34cc45 100644
--- a/lotuswordpro/source/filter/bentoid.hxx
+++ b/lotuswordpro/source/filter/bentoid.hxx
@@ -61,20 +61,11 @@ namespace OpenStormBento
 
 #define BEN_OBJID_TOC 1 // TOC object ID
 #define BEN_PROPID_TOC_SEED 2 // TOC object starting seed
-#define BEN_PROPID_TOC_MIN_SEED 3 // TOC object minimum seed
-#define BEN_PROPID_TOC_OBJECT 4 // TOC object
-#define BEN_PROPID_TOC_CONTAINER 5 // TOC object entire container
-#define BEN_PROPID_TOC_DELETED 6 // TOC object amount deleted
 #define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type
-#define BEN_OBJID_WRITEABLE 20 // Predefined ID's below this value will be
-   // written to container TOC.  Predefined IDs
-   // above this are not written
 #define BEN_TYPEID_7_BIT_ASCII 21 // 7-bit ASCII
 #define BEN_PROPID_GLOBAL_TYPE_NAME 23 // Global type name
 #define BEN_PROPID_GLOBAL_PROPERTY_NAME 24 // Global property name
 #define BEN_PROPID_OBJ_REFERENCES 31 // Referenced objects from an object
-#define BEN_TYPEID_OBJ_REFERENCES_DATA 32 // Reference data
-#define BEN_OBJID_MIN_GENERAL_ID 100 // Min object ID for general std objects
 
 #define BEN_NEW_OBJECT 1 // object + property + type
 #define BEN_NEW_PROPERTY 2 // property + type
@@ -95,14 +86,6 @@ namespace OpenStormBento
 #define BEN_SEGMENT_CODE_END 14
 
 #define BEN_REFERENCE_LIST_ID 15 // references recording object ID
-#define BEN_RESERVED4B 16
-#define BEN_RESERVED4C 17
-#define BEN_RESERVED8A 18 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8B 19 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8C 20 // reserved for future use of 8 byte entry
-#define BEN_RESERVED12A 21 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12B 22 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12C 23 // reserved for future use of 12 byte entry
 #define BEN_END_OF_BUFFER 24 // end of current buffer, go to next
 #define BEN_READ_PAST_END_OF_TOC 50 // Our code
 #define BEN_NOOP 0xFF
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index a920e64..0e4a737 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -98,16 +98,7 @@ private:
 enum
 {
 DOC_PROTECTED = 0x0004UL,
-/*#define DOC_USECONTENTS   0x0008UL
-#define DOC_LOCKREVISIONS   0x0200UL
-#define DOC_LOCAL   0x0400UL
-*/
 DOC_CHILDDOC =  0x0800UL
-/*#define DOC_DOPREVIEW 0x0200UL
-#define DOC_REBUILDENDNOTES 0x0400UL
-#define DOC_FILEPROTECTION  0x1000UL
-#define DOC_PERSISTENTBITS  (DOC_PROTECTED | DOC_USECONTENTS | 
DOC_LOCKREVISIONS | DOC_LOCAL | DOC_CHILDDOC | DOC_DOPREVIEW | 
DOC_REBUILDENDNOTES | DOC_FILEPROTECTION)
-*/
 };
 
 //Code cleaning by change some members to local variables in Read()
diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx 
b/lotuswordpro/source/filter/lwpfribheader.hxx
index 03757ce..143799e 100644
--- a/lotuswordpro/source/filter/lwpfribheader.hxx
+++ b/lotuswordpro/source/filter/lwpfribheader.hxx
@@ -68,10 +68,7 @@
 #define FRIB_MTAG_CHARSTYLE 3
 #define FRIB_MTAG_ATTRIBUTE 4
 #define FRIB_MTAG_LANGUAGE  5
-#define FRIB_MTAG_CHARBORDER6
-#define FRIB_MTAG_AMIKAKE   7
 #define FRIB_MTAG_CODEPAGE  8
-#define FRIB_MTAG_STXLINK   9   // SmarText; do not #ifdef out
 
 #define FT_MAXIMUM  30
 
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx 
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 718d5f5..aa6fa88 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -85,9 +85,7 @@
 #include 
 
 #define EF_NONE 0x
-#define EF_FTP 0x0001
 #define EF_ODMA 0x0002
-#define EF_NOS 0x0003
 
 LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
 : L

[Libreoffice-commits] .: lotuswordpro/source

2012-07-16 Thread Julien Nabet

 lotuswordpro/source/filter/xfilter/xfparastyle.cxx |   86 ++---
 1 file changed, 45 insertions(+), 41 deletions(-)

New commits:
commit 00ae1cec08ae970f0640c0cc5d612eb0b9035207
Author: Julien Nabet 
Date:   Mon Jul 16 22:54:38 2012 +0200

Change form of checking self-assignment + cleaning before assigning

Change-Id: Idc8e8445b870805b99d2b9434cf1f752c63cc6a0

diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx 
b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 1bccbcd..64296a2 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -116,7 +116,7 @@ XFParaStyle::XFParaStyle(const XFParaStyle& other) : 
XFStyle(other)
 m_aLineHeight = other.m_aLineHeight;
 m_aPadding = other.m_aPadding;
 m_aBreaks = other.m_aBreaks;
-//  m_aTabs = other.m_aTabs;
+
 for (size_t i=0; i(pStyle);
-if( pTabStyle )
+const IXFStyle *pStyle = other.m_aTabs.Item(i);
+if( pStyle )
 {
-XFTabStyle *pCopyStyle = new XFTabStyle(*pTabStyle);
-m_aTabs.AddStyle(pCopyStyle);
+const XFTabStyle *pTabStyle = dynamic_cast(pStyle);
+if( pTabStyle )
+{
+XFTabStyle *pCopyStyle = new XFTabStyle(*pTabStyle);
+m_aTabs.AddStyle(pCopyStyle);
+}
 }
 }
 }
-
 return *this;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source

2012-07-14 Thread Julien Nabet

 lotuswordpro/source/filter/xfilter/xfparastyle.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 528b406bc2b9cc6dcbce54303f024d32fbe41e3f
Author: Julien Nabet 
Date:   Sat Jul 14 19:48:09 2012 +0200

Check for assignment to self for =operator

Change-Id: I88369c1b0c6f261e8350d196b56acdc8f8f61ce8

diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx 
b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 0909f29..1bccbcd 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -134,6 +134,9 @@ XFParaStyle::XFParaStyle(const XFParaStyle& other) : 
XFStyle(other)
 
 XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other)
 {
+// Check for self-assignment
+if (this == &other)
+return *this;
 m_strParentStyleName = other.m_strParentStyleName;
 m_nFlag = other.m_nFlag;
 m_eAlignType = other.m_eAlignType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source

2012-07-13 Thread Julien Nabet

 lotuswordpro/source/filter/xfilter/xfpagemaster.cxx |   25 
 1 file changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 962d78294bec0df5e5120ac8fd10355a6e0e6988
Author: Julien Nabet 
Date:   Sat Jul 14 00:45:57 2012 +0200

Perform initalization in initialization list

Change-Id: I103af00b8d4f057ecf427914d35aaa02fcf452ae

diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx 
b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index 95e1f98..74a46a1 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -68,27 +68,12 @@
 #include"xffooterstyle.hxx"
 #include"xfbgimage.hxx"
 
-XFPageMaster::XFPageMaster()
+XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), 
m_eUsage(enumXFPageUsageNone),
+m_eTextDir(enumXFTextDirNone), m_bPrintOrient(sal_True), m_pBorders(NULL), 
m_pShadow(NULL),
+m_pColumns(NULL), m_pBGImage(NULL), m_pHeaderStyle(NULL), m_pFooterStyle(NULL),
+m_eSepAlign(enumXFAlignNone), m_fSepWidth(0), m_aSepColor(0), 
m_fSepSpaceAbove(0),
+m_fSepSpaceBelow(0), m_nSepLengthPercent(0)
 {
-m_fPageWidth = 0;
-m_fPageHeight = 0;
-m_eUsage = enumXFPageUsageNone;
-m_eTextDir = enumXFTextDirNone;
-m_bPrintOrient = sal_True;
-m_pBorders = NULL;
-m_pShadow = NULL;
-m_pColumns = NULL;
-m_pBGImage = NULL;
-
-m_pHeaderStyle = NULL;
-m_pFooterStyle = NULL;
-
-m_eSepAlign = enumXFAlignNone;
-m_fSepWidth = 0;
-m_aSepColor = 0;
-m_fSepSpaceAbove = 0;
-m_fSepSpaceBelow = 0;
-m_nSepLengthPercent = 0;
 }
 
 XFPageMaster::~XFPageMaster()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source

2012-06-01 Thread Thorsten Behrens

 lotuswordpro/source/filter/lwp9reader.cxx|6 +-
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx |   13 ++--
 lotuswordpro/source/filter/lwpdrawobj.cxx|   18 +++---
 lotuswordpro/source/filter/lwpdrawobj.hxx|   10 ++-
 lotuswordpro/source/filter/lwpfribmark.cxx   |2 
 lotuswordpro/source/filter/lwpsilverbullet.cxx   |   52 ---
 lotuswordpro/source/filter/lwpsilverbullet.hxx   |   10 +--
 lotuswordpro/source/filter/xfilter/xftextcontent.cxx |4 -
 lotuswordpro/source/filter/xfilter/xftextstyle.cxx   |   12 ++--
 9 files changed, 64 insertions(+), 63 deletions(-)

New commits:
commit fcc31f1749e01e4184c4347929a9e1d7e782dee1
Author: Thorsten Behrens 
Date:   Fri Jun 1 17:53:42 2012 +0200

Targeted string re-work for lotuswordpro filter

Also cleaned up commented code, and a few extraneous temporaries

diff --git a/lotuswordpro/source/filter/lwp9reader.cxx 
b/lotuswordpro/source/filter/lwp9reader.cxx
index bd1a81d..29c52d3 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -211,7 +211,7 @@ void Lwp9Reader::ParseDocument()
 pChangeMgr->ConvertAllChange(m_pStream);
 
 doc->Parse(m_pStream);
-
m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:body")));
+m_pStream->EndElement(::rtl::OUString("office:body"));
 
 WriteDocEnd();
 }
@@ -247,7 +247,7 @@ void Lwp9Reader::WriteDocHeader()
 pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text"));
 pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0"));
 
-m_pStream->StartElement( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")) );
+m_pStream->StartElement( ::rtl::OUString("office:document") );
 pAttrList->Clear();
 
 }
@@ -256,7 +256,7 @@ void Lwp9Reader::WriteDocHeader()
  */
 void Lwp9Reader::WriteDocEnd()
 {
-
m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")));
+m_pStream->EndElement(::rtl::OUString("office:document"));
 m_pStream->EndDocument();
 }
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx 
b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 0292186..78fa738 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -99,24 +99,25 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr()
 rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, 
LwpBulletOverride* pBullOver,
 LwpIndentOverride* pIndent)
 {
+rtl::OUString aEmpty;
+
 if(!pPara || !pIndent || !pBullOver)
 {
-//  assert(false);
-return rtl::OUString();
+return aEmpty;
 }
 
 LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
 if (!pSilverBullet)
 {
 assert(false);
-return rtl::OUString();
+return aEmpty;
 }
 
 LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
 if (!pBulletPara)
 {
 assert(false);
-return rtl::OUString();
+return aEmpty;
 }
 
 LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
@@ -203,7 +204,7 @@ rtl::OUString 
LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
 rtl::OUString aNumber = 
LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
 if (pParaNumber->GetStyleID() == NUMCHAR_01 || 
pParaNumber->GetStyleID() == NUMCHAR_Chinese4)
 {
-aPrefix += 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
+aPrefix += rtl::OUString("0");
 }
 aFmt.SetPrefix(aPrefix);
 
@@ -231,7 +232,7 @@ rtl::OUString 
LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
 }
 
 pListStyle->SetListBullet(nPos, 
LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(),
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Times New 
Roman")), aPrefix, aSuffix);
+rtl::OUString("Times New Roman"), aPrefix, aSuffix);
 }
 
 pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index e0eeea1..9a5f29f 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -339,31 +339,31 @@ rtl::OUString LwpDrawObj::GetArrowName(sal_uInt8 
nArrowStyle)
 {
 default:
 case AH_ARROW_FULLARROW:
-aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Symmetric 
arrow"));
+aArrowName = rtl::OUString("Symmetric arrow");
 break;
 case AH_ARROW_HALFARROW:
-aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow 
concave"));
+aArrowName = rtl::OUString("Arrow concave");
 break;
 case AH_ARROW_LINEARROW:
-aArrowName =

[Libreoffice-commits] .: lotuswordpro/source

2012-05-09 Thread Caolán McNamara

 lotuswordpro/source/filter/explode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f909446caae6d4e091c2bb2dae36ae648491eef2
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 14:27:42 2012 +0100

WaE: C4146 unary operator applied to unsigned type

Change-Id: I5326baab63d8ec30a2f7fcb027c4a5a5526acdf0

diff --git a/lotuswordpro/source/filter/explode.cxx 
b/lotuswordpro/source/filter/explode.cxx
index 241d43d..625d1cf 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -306,7 +306,7 @@ sal_Int32 Decompression::explode()
 
 m_pOutStream->Flush();
 // point back to copy position and read bytes
-m_pOutStream->SeekRel((long)-distance);
+m_pOutStream->SeekRel(-(long)distance);
 sal_uInt8 sTemp[MAXWIN];
 sal_uInt32 nRead = distance > Length? Length:distance;
 m_pOutStream->Read(sTemp, nRead);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source sw/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

[Libreoffice-commits] .: lotuswordpro/source

9 matches

Site Navigation

Mail list logo

Footer information