[Libreoffice-commits] .: editeng/inc editeng/source

2012-04-18 Thread Kohei Yoshida 
 editeng/inc/editeng/flditem.hxx  |   38 ++
 editeng/source/items/flditem.cxx |   15 +++
 2 files changed, 37 insertions(+), 16 deletions(-)

New commits:
commit 7746e42006a5732a9e26dd21481391f0419d0a2e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Apr 17 16:54:00 2012 -0400

Non-inlining constructors.

diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index be874b0..4b85be9 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -194,8 +194,9 @@ public:
 class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxPageField, SvxFieldData, 
SVX_PAGEFIELD )
-SvxPageField() {}
+SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
+SvxPageField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 
@@ -205,8 +206,9 @@ public:
 class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, 
SVX_PAGESFIELD )
-SvxPagesField() {}
+SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
+SvxPagesField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 };
@@ -214,8 +216,9 @@ public:
 class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, 
SVX_TIMEFIELD )
-SvxTimeField() {}
+SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
+SvxTimeField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 
@@ -225,8 +228,9 @@ public:
 class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxFileField, SvxFieldData, 
SVX_FILEFIELD )
-SvxFileField() {}
+SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
+SvxFileField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 };
@@ -234,8 +238,9 @@ public:
 class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxTableField, SvxFieldData, 
SVX_TABLEFIELD )
-SvxTableField() {}
+SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
+SvxTableField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 };
@@ -382,8 +387,9 @@ public:
 class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, 
SVX_HEADERFIELD )
-SvxHeaderField() {}
+SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
+SvxHeaderField();
+
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 };
@@ -393,8 +399,8 @@ public:
 class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, 
SVX_FOOTERFIELD )
-SvxFooterField() {}
+SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
+SvxFooterField();
 virtual SvxFieldData*   Clone() const;
 virtual int operator==( const SvxFieldData ) const;
 };
@@ -404,8 +410,8 @@ public:
 class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, 
SVX_DATEFIMEFIELD )
-SvxDateTimeField() {}
+SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
+SvxDateTimeField();
 
 static rtl::OUStringGetFormatted( Date rDate, Time rTime, int 
eFormat, SvNumberFormatter rFormatter, LanguageType eLanguage );
 
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 46153e6..fb16479 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -436,6 +436,8 @@ MetaAction* SvxURLField::createBeginComment() const
 
 SV_IMPL_PERSIST1( SvxPageField, SvxFieldData );
 
+SvxPageField::SvxPageField() {}
+
 SvxFieldData* SvxPageField::Clone() const
 {
 return new SvxPageField;// empty
@@ -462,6 +464,8 @@ MetaAction* SvxPageField::createBeginComment() const
 
 SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData );
 
+SvxPagesField::SvxPagesField() {}
+
 SvxFieldData* SvxPagesField::Clone() const
 {
 return new SvxPagesField;   // empty
@@ -482,6 +486,8 @@ void SvxPagesField::Save( SvPersistStream  /*rStm*/ )
 
 SV_IMPL_PERSIST1(

[Libreoffice-commits] .: editeng/inc editeng/source

2012-04-14 Thread Kohei Yoshida 
 editeng/inc/editeng/editeng.hxx|1 +
 editeng/source/editeng/editeng.cxx |5 +
 editeng/source/editeng/impedit.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 89de9dfe27d6a406fb67570c3507a8ea2e387d24
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Sat Apr 14 02:03:46 2012 -0400

Really fix the build.

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index f3be3d2..8cdc6ef 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -139,6 +139,7 @@ private:
 
 EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
 EDITENG_DLLPRIVATE void CheckIdleFormatter();
+EDITENG_DLLPRIVATE bool IsIdleFormatterActive() const;
 EDITENG_DLLPRIVATE ParaPortion* FindParaPortion(ContentNode* pNode);
 EDITENG_DLLPRIVATE const ParaPortion* FindParaPortion(ContentNode* pNode) 
const;
 EDITENG_DLLPRIVATE const ParaPortion* GetPrevVisPortion(const ParaPortion* 
pCurPortion) const;
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 0adfec1..3410fba 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -702,6 +702,11 @@ void EditEngine::CheckIdleFormatter()
 pImpEditEngine-CheckIdleFormatter();
 }
 
+bool EditEngine::IsIdleFormatterActive() const
+{
+return pImpEditEngine-aIdleFormatter.IsActive();
+}
+
 ParaPortion* EditEngine::FindParaPortion(ContentNode* pNode)
 {
 return pImpEditEngine-FindParaPortion(pNode);
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 81edb23..3b31282 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -174,7 +174,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, 
Region* pRegion )
 pOutWin-GetCursor()-Hide();
 }
 
-DBG_ASSERT( !pEditEngine-aIdleFormatter.IsActive(), DrawSelection: Not 
formatted! );
+DBG_ASSERT( !pEditEngine-IsIdleFormatterActive(), DrawSelection: Not 
formatted! );
 aTmpSel.Adjust( pEditEngine-pImpEditEngine-GetEditDoc() );
 
 ContentNode* pStartNode = aTmpSel.Min().GetNode();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/source

2012-03-29 Thread Lubos Lunak 
 editeng/inc/editeng/editview.hxx|1 +
 editeng/inc/editeng/outliner.hxx|1 +
 editeng/source/editeng/editview.cxx |   11 ---
 editeng/source/outliner/outlvw.cxx  |6 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 15cb0bbd4b4c9871f6fb2d24013fb9d4fe4a2a34
Author: Luboš Luňák l.lu...@suse.cz
Date:   Thu Mar 29 09:53:19 2012 +0200

fix constness compile error

diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index aa9864f..8e034c8 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -184,6 +184,7 @@ public:
 voidForceUpdate();
 
 const SfxStyleSheet* GetStyleSheet() const;
+SfxStyleSheet* GetStyleSheet();
 
 voidSetAnchorMode( EVAnchorMode eMode );
 EVAnchorModeGetAnchorMode() const;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index ee7edec..da3b9c2 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -309,6 +309,7 @@ public:
 voidPasteSpecial();
 
 const SfxStyleSheet*  GetStyleSheet() const;
+SfxStyleSheet*  GetStyleSheet();
 
 voidSetControlWord( sal_uLong nWord );
 sal_uLong   GetControlWord() const;
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 6d78cf5..36bafa0 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -730,7 +730,7 @@ void EditView::ForceUpdate()
 PIMPEE-SetUpdateMode( sal_True, this, sal_True );
 }
 
-const SfxStyleSheet* EditView::GetStyleSheet() const
+SfxStyleSheet* EditView::GetStyleSheet()
 {
 DBG_CHKTHIS( EditView, 0 );
 DBG_CHKOBJ( pImpEditView-pEditEngine, EditEngine, 0 );
@@ -741,10 +741,10 @@ const SfxStyleSheet* EditView::GetStyleSheet() const
 sal_uInt16 nStartPara = PIMPEE-GetEditDoc().GetPos( aSel.Min().GetNode() 
);
 sal_uInt16 nEndPara = PIMPEE-GetEditDoc().GetPos( aSel.Max().GetNode() );
 
-const SfxStyleSheet* pStyle = NULL;
+SfxStyleSheet* pStyle = NULL;
 for ( sal_uInt16 n = nStartPara; n = nEndPara; n++ )
 {
-const SfxStyleSheet* pTmpStyle = PIMPEE-GetStyleSheet( n );
+SfxStyleSheet* pTmpStyle = PIMPEE-GetStyleSheet( n );
 if ( ( n != nStartPara )  ( pStyle != pTmpStyle ) )
 return NULL;// Not unique.
 pStyle = pTmpStyle;
@@ -752,6 +752,11 @@ const SfxStyleSheet* EditView::GetStyleSheet() const
 return pStyle;
 }
 
+const SfxStyleSheet* EditView::GetStyleSheet() const
+{
+return const_cast EditView* ( this )-GetStyleSheet();
+}
+
 sal_Bool EditView::IsInsertMode() const
 {
 DBG_CHKTHIS( EditView, 0 );
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 26f0494..23a9775 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -786,6 +786,12 @@ const SfxStyleSheet* OutlinerView::GetStyleSheet() const
 return pEditView-GetStyleSheet();
 }
 
+SfxStyleSheet* OutlinerView::GetStyleSheet()
+{
+DBG_CHKTHIS(OutlinerView,0);
+return pEditView-GetStyleSheet();
+}
+
 Pointer OutlinerView::GetPointer( const Point rPosPixel )
 {
 DBG_CHKTHIS(OutlinerView,0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/source

2012-03-28 Thread Kohei Yoshida 
 editeng/inc/editeng/editeng.hxx |3 
 editeng/inc/editeng/editview.hxx|2 
 editeng/inc/editeng/outliner.hxx|2 
 editeng/source/editeng/editdbg.cxx  |2 
 editeng/source/editeng/editdoc.cxx  |  112 
 editeng/source/editeng/editdoc.hxx  |   63 ++--
 editeng/source/editeng/editdoc2.cxx |   80 ++---
 editeng/source/editeng/editeng.cxx  |8 --
 editeng/source/editeng/editview.cxx |6 -
 editeng/source/editeng/impedit.cxx  |4 -
 editeng/source/editeng/impedit.hxx  |   31 -
 editeng/source/editeng/impedit2.cxx |   39 +---
 editeng/source/editeng/impedit3.cxx |2 
 editeng/source/editeng/impedit4.cxx |8 +-
 editeng/source/editeng/impedit5.cxx |   22 ++-
 editeng/source/outliner/outlvw.cxx  |2 
 16 files changed, 139 insertions(+), 247 deletions(-)

New commits:
commit 8bf6eb4519b4b92390570341a10872e65fd95dc1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 29 01:44:32 2012 -0400

Revert ContentList no longer a child class of DummyContentList.

This reverts commit ea8f2cbee079932e7f5d9ab646996b472a120c76.

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index c17b15b..4c0d5e0 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -328,8 +328,7 @@ public:
 SfxStyleSheetPool*  GetStyleSheetPool();
 
 voidSetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle 
);
-const SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara ) const;
-SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara );
+SfxStyleSheet*  GetStyleSheet( sal_uInt16 nPara ) const;
 
 voidSetWordDelimiters( const String rDelimiters );
 String  GetWordDelimiters() const;
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index aa9864f..7f3dd4c 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -183,7 +183,7 @@ public:
 voidSetEditEngineUpdateMode( sal_Bool bUpdate );
 voidForceUpdate();
 
-const SfxStyleSheet* GetStyleSheet() const;
+SfxStyleSheet*  GetStyleSheet() const;
 
 voidSetAnchorMode( EVAnchorMode eMode );
 EVAnchorModeGetAnchorMode() const;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index ee7edec..faceb8a 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -308,7 +308,7 @@ public:
 voidPaste();
 voidPasteSpecial();
 
-const SfxStyleSheet*  GetStyleSheet() const;
+SfxStyleSheet*  GetStyleSheet() const;
 
 voidSetControlWord( sal_uLong nWord );
 sal_uLong   GetControlWord() const;
diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 48f6e00..4070002 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -335,7 +335,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool 
bInfoBox )
 for ( sal_uInt16 nPortion = 0; nPortion  
pEE-pImpEditEngine-GetParaPortions(). Count(); nPortion++)
 {
 
-ParaPortion* pPPortion = 
pEE-pImpEditEngine-GetParaPortions()[nPortion];
+ParaPortion* pPPortion = 
pEE-pImpEditEngine-GetParaPortions().GetObject(nPortion );
 fprintf( fp, \nParagraph %i: Length = %i, Invalid = %i\nText = '%s', 
nPortion, pPPortion-GetNode()-Len(), pPPortion-IsInvalid(), 
rtl::OUStringToOString( *pPPortion-GetNode(), RTL_TEXTENCODING_ASCII_US 
).getStr() );
 fprintf( fp, \nVorlage: );
 SfxStyleSheet* pStyle = pPPortion-GetNode()-GetStyleSheet();
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 5df6635..f83d054 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -256,6 +256,8 @@ sal_uInt16 aV5Map[] = {
 4035, 4036, 4037, 4038
 };
 
+SV_IMPL_PTRARR( DummyContentList, ContentNode* );
+
 EditCharAttrib* MakeCharAttrib( SfxItemPool rPool, const SfxPoolItem rAttr, 
sal_uInt16 nS, sal_uInt16 nE )
 {
 // Create a new attribute in the pool
@@ -565,25 +567,6 @@ sal_uInt16 EditLineList::FindLine( sal_uInt16 nChar, 
sal_Bool bInclEnd )
 return ( Count() - 1 );
 }
 
-EditPaM::EditPaM() : pNode(NULL), nIndex(0) {}
-EditPaM::EditPaM(const EditPaM r) : pNode(r.pNode), nIndex(r.nIndex) {}
-EditPaM::EditPaM(ContentNode* p, sal_uInt16 n) : pNode(p), nIndex(n) {}
-
-const ContentNode* EditPaM::GetNode() const
-{
-return pNode;
-}
-
-ContentNode* EditPaM::GetNode()
-{
-return pNode;
-}
-
-void EditPaM::SetNode(ContentNode* p)
-{
-pNode = p;
-}
-
 sal_Bool EditPaM::DbgIsBuggy( EditDoc rDoc )
 {
 if ( !pNode )
@@ -650,8 +633,8 @@ sal_Bool EditSelection::Adjust( const ContentList rNodes )
 DBG_ASSERT( aStartPaM.GetIndex() = aStartPaM.GetNode()-Len(), Index out 
of range in Adjust(1) );

[Libreoffice-commits] .: editeng/inc editeng/source

2012-03-28 Thread Kohei Yoshida 
 editeng/inc/editeng/editeng.hxx |3 
 editeng/inc/editeng/editview.hxx|2 
 editeng/inc/editeng/outliner.hxx|2 
 editeng/source/editeng/editdbg.cxx  |2 
 editeng/source/editeng/editdoc.cxx  |  116 +++-
 editeng/source/editeng/editdoc.hxx  |   63 +--
 editeng/source/editeng/editdoc2.cxx |   80 ++--
 editeng/source/editeng/editeng.cxx  |8 ++
 editeng/source/editeng/editview.cxx |6 -
 editeng/source/editeng/impedit.cxx  |4 -
 editeng/source/editeng/impedit.hxx  |   31 -
 editeng/source/editeng/impedit2.cxx |   39 ++--
 editeng/source/editeng/impedit3.cxx |2 
 editeng/source/editeng/impedit4.cxx |8 +-
 editeng/source/editeng/impedit5.cxx |   22 --
 editeng/source/outliner/outlvw.cxx  |2 
 16 files changed, 249 insertions(+), 141 deletions(-)

New commits:
commit c802cbad7f25d3070f2ae5fd8a7e1a7ce17f99a9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 29 01:43:30 2012 -0400

ContentList no longer a child class of DummyContentList (take 2).

The previous commit was bad as it would cause segfalut on startup.

This one is good as far as I can tell.

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 4c0d5e0..c17b15b 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -328,7 +328,8 @@ public:
 SfxStyleSheetPool*  GetStyleSheetPool();
 
 voidSetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle 
);
-SfxStyleSheet*  GetStyleSheet( sal_uInt16 nPara ) const;
+const SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara ) const;
+SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara );
 
 voidSetWordDelimiters( const String rDelimiters );
 String  GetWordDelimiters() const;
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 7f3dd4c..aa9864f 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -183,7 +183,7 @@ public:
 voidSetEditEngineUpdateMode( sal_Bool bUpdate );
 voidForceUpdate();
 
-SfxStyleSheet*  GetStyleSheet() const;
+const SfxStyleSheet* GetStyleSheet() const;
 
 voidSetAnchorMode( EVAnchorMode eMode );
 EVAnchorModeGetAnchorMode() const;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index faceb8a..ee7edec 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -308,7 +308,7 @@ public:
 voidPaste();
 voidPasteSpecial();
 
-SfxStyleSheet*  GetStyleSheet() const;
+const SfxStyleSheet*  GetStyleSheet() const;
 
 voidSetControlWord( sal_uLong nWord );
 sal_uLong   GetControlWord() const;
diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 4070002..48f6e00 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -335,7 +335,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool 
bInfoBox )
 for ( sal_uInt16 nPortion = 0; nPortion  
pEE-pImpEditEngine-GetParaPortions(). Count(); nPortion++)
 {
 
-ParaPortion* pPPortion = 
pEE-pImpEditEngine-GetParaPortions().GetObject(nPortion );
+ParaPortion* pPPortion = 
pEE-pImpEditEngine-GetParaPortions()[nPortion];
 fprintf( fp, \nParagraph %i: Length = %i, Invalid = %i\nText = '%s', 
nPortion, pPPortion-GetNode()-Len(), pPPortion-IsInvalid(), 
rtl::OUStringToOString( *pPPortion-GetNode(), RTL_TEXTENCODING_ASCII_US 
).getStr() );
 fprintf( fp, \nVorlage: );
 SfxStyleSheet* pStyle = pPPortion-GetNode()-GetStyleSheet();
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index f83d054..010f40f 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -256,8 +256,6 @@ sal_uInt16 aV5Map[] = {
 4035, 4036, 4037, 4038
 };
 
-SV_IMPL_PTRARR( DummyContentList, ContentNode* );
-
 EditCharAttrib* MakeCharAttrib( SfxItemPool rPool, const SfxPoolItem rAttr, 
sal_uInt16 nS, sal_uInt16 nE )
 {
 // Create a new attribute in the pool
@@ -567,6 +565,25 @@ sal_uInt16 EditLineList::FindLine( sal_uInt16 nChar, 
sal_Bool bInclEnd )
 return ( Count() - 1 );
 }
 
+EditPaM::EditPaM() : pNode(NULL), nIndex(0) {}
+EditPaM::EditPaM(const EditPaM r) : pNode(r.pNode), nIndex(r.nIndex) {}
+EditPaM::EditPaM(ContentNode* p, sal_uInt16 n) : pNode(p), nIndex(n) {}
+
+const ContentNode* EditPaM::GetNode() const
+{
+return pNode;
+}
+
+ContentNode* EditPaM::GetNode()
+{
+return pNode;
+}
+
+void EditPaM::SetNode(ContentNode* p)
+{
+pNode = p;
+}
+
 sal_Bool EditPaM::DbgIsBuggy( EditDoc rDoc )
 {
 if ( !pNode )
@@ -633,8 +650,8 @@ sal_Bool EditSelection::Adjust( const ContentList rNodes )
 DBG_ASSERT( aStartPaM.GetIndex() =

[Libreoffice-commits] .: editeng/inc editeng/source svtools/inc svtools/source svx/inc svx/source unusedcode.easy vcl/inc vcl/source

2012-02-18 Thread Michael Meeks 
 editeng/inc/editeng/unoedhlp.hxx   |3 -
 editeng/source/uno/unoedhlp.cxx|   15 -
 svtools/inc/svtools/svtabbx.hxx|1 
 svtools/source/contnr/svtabbx.cxx  |   12 ---
 svx/inc/svx/svdsob.hxx |1 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |   27 -
 svx/source/inc/GraphCtlAccessibleContext.hxx   |7 
 svx/source/svdraw/svdlayer.cxx |   24 ---
 unusedcode.easy|9 -
 vcl/inc/outfont.hxx|3 -
 vcl/source/gdi/outdev3.cxx |   12 ---
 11 files changed, 114 deletions(-)

New commits:
commit 78e9ba6febb7402d4661fbf7934a2526efc8629a
Author: Elton Chung el...@layerjet.com
Date:   Sat Feb 18 14:19:49 2012 +0800

Remove unused code

diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index 5d8caa6..cb37292 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -61,9 +61,6 @@ public:
 sal_uLong   GetValue() const;
 sal_uLong   GetStartValue() const;
 sal_uLong   GetEndValue() const;
-voidSetValue( sal_uLong n );
-voidSetStartValue( sal_uLong n );
-voidSetEndValue( sal_uLong n );
 };
 
 /** Helper class for common functionality in edit sources
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 57d50f0..fb1b033 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -63,21 +63,6 @@ sal_uLong SvxEditSourceHint::GetEndValue() const
 return mnEnd;
 }
 
-void SvxEditSourceHint::SetValue( sal_uLong n )
-{
-TextHint::SetValue( n );
-}
-
-void SvxEditSourceHint::SetStartValue( sal_uLong n )
-{
-mnStart = n;
-}
-
-void SvxEditSourceHint::SetEndValue( sal_uLong n )
-{
-mnEnd = n;
-}
-
 //
 
 ::std::auto_ptrSfxHint SvxEditSourceHelper::EENotification2Hint( EENotify* 
aNotify )
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 749df91..38aa9c0 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -120,7 +120,6 @@ public:
 
 virtual voidResize();
 voidSetTabJustify( sal_uInt16 nTab, SvTabJustify );
-SvTabJustifyGetTabJustify( sal_uInt16 nTab ) const;
 };
 
 inline long SvTabListBox::GetTab( sal_uInt16 nTab ) const
diff --git a/svtools/source/contnr/svtabbx.cxx 
b/svtools/source/contnr/svtabbx.cxx
index 8d1ad28..b1b2bd1 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -538,18 +538,6 @@ void SvTabListBox::SetTabJustify( sal_uInt16 nTab, 
SvTabJustify eJustify)
 Invalidate();
 }
 
-SvTabJustify SvTabListBox::GetTabJustify( sal_uInt16 nTab ) const
-{
-SvTabJustify eResult = AdjustLeft;
-if( nTab = nTabCount )
-return eResult;
-SvLBoxTab* pTab = (pTabList[ nTab ]);
-sal_uInt16 nFlags = pTab-nFlags;
-nFlags = MYTABMASK;
-eResult = (SvTabJustify)nFlags;
-return eResult;
-}
-
 long SvTabListBox::GetLogicTab( sal_uInt16 nTab )
 {
 if( SvTreeListBox::nTreeFlags  TREEFLAG_RECALCTABS )
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index 4f7c515..feec79e 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
@@ -96,7 +96,6 @@ public:
 
 sal_Bool IsEmpty() const;
 
-sal_uInt16 GetSetCount() const;
 void operator=(const SetOfByte r2ndSet);
 void operator|=(const SetOfByte r2ndSet);
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx 
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 208106e..43960d3 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -735,39 +735,12 @@ void SAL_CALL 
SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32
 
 //=  internals 
 
-void SvxGraphCtrlAccessibleContext::checkChildIndex( long nIndex ) throw( 
lang::IndexOutOfBoundsException )
-{
-if( nIndex  0 || nIndex = getAccessibleChildCount() )
-throw lang::IndexOutOfBoundsException();
-}
-
-//-
-
 void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) 
throw( lang::IndexOutOfBoundsException )
 {
 if( nIndex  0 || nIndex = getSelectedAccessibleChildCount() )
 throw lang::IndexOutOfBoundsException();
 }
 
-//-
-
-void SvxGraphCtrlAccessibleContext::setName( const OUString rName )
-{
-::SolarMutexGuard aGuard;
-
-msName = rName;
-}
-

[Libreoffice-commits] .: editeng/inc editeng/source unusedcode.easy

2012-02-14 Thread Michael Meeks 
 editeng/inc/editeng/numitem.hxx  |1 -
 editeng/source/items/numitem.cxx |   17 -
 unusedcode.easy  |1 -
 3 files changed, 19 deletions(-)

New commits:
commit 1dc612970f57aa5599c6d1b7afb10a3f5f4403d2
Author: Santiago Martinez smvar...@gmail.com
Date:   Mon Feb 13 22:31:23 2012 +0100

Remove unused code.

diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 1084ea1..ea34a7f 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -278,7 +278,6 @@ public:
 const SvxNumberFormat*  Get(sal_uInt16 nLevel)const;
 const SvxNumberFormat  GetLevel(sal_uInt16 nLevel)const;
 voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat 
rFmt, sal_Bool bIsValid = sal_True);
-voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat* 
pFmt);
 
 sal_BoolIsContinuousNumbering()const
 {return bContinuousNumbering;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 01fc463..ccb3455 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -759,23 +759,6 @@ void SvxNumRule::SetLevel( sal_uInt16 i, const 
SvxNumberFormat rNumFmt, sal_Boo
 }
 }
 
-void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
-{
-DBG_ASSERT(nLevel  SVX_MAX_NUM, Wrong Level );
-
-if( nLevel  SVX_MAX_NUM )
-{
-aFmtsSet[nLevel] = 0 != pFmt;
-if(pFmt)
-SetLevel(nLevel, *pFmt);
-else
-{
-delete aFmts[nLevel];
-aFmts[nLevel] = 0;
-}
-}
-}
-
 String  SvxNumRule::MakeNumString( const SvxNodeNum rNum, sal_Bool 
bInclStrings ) const
 {
 String aStr;
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a40c2f..5142e88 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -369,7 +369,6 @@ SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, 
unsigned short)
 SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, 
unsigned short)
 SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const, unsigned short)
 SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
-SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*)
 SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**)
 SvxPluginFileDlg::IsAvailable(unsigned short)
 SvxPopupWindowListBox::StartSelection()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/source filter/inc filter/source linguistic/source svtools/inc svtools/source sw/source unusedcode.easy vcl/inc vcl/source

2012-02-13 Thread Michael Meeks 
 editeng/inc/editeng/editview.hxx|3 ---
 editeng/source/editeng/editdoc.cxx  |8 
 editeng/source/editeng/editdoc.hxx  |1 -
 editeng/source/editeng/editview.cxx |   19 ---
 filter/inc/filter/msfilter/msdffimp.hxx |1 -
 filter/source/msfilter/msdffimp.cxx |   10 --
 linguistic/source/lngsvcmgr.cxx |   15 ---
 linguistic/source/lngsvcmgr.hxx |3 ---
 svtools/inc/svtools/ctrlbox.hxx |1 -
 svtools/inc/svtools/filectrl.hxx|1 -
 svtools/source/control/ctrlbox.cxx  |   22 --
 svtools/source/control/filectrl.cxx |9 -
 sw/source/filter/ww8/ww8par.hxx |1 -
 sw/source/filter/ww8/ww8par5.cxx|5 -
 unusedcode.easy |   10 --
 vcl/inc/vcl/metric.hxx  |1 -
 vcl/source/gdi/metric.cxx   |7 ---
 17 files changed, 117 deletions(-)

New commits:
commit abc235e73e70ffba83240759a8500a08becc9d71
Author: Elton Chung el...@layerjet.com
Date:   Mon Feb 13 16:08:52 2012 +

Remove unused code

diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index ef02fa9..7f3dd4c 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -103,7 +103,6 @@ public:
 voidShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool 
bForceVisCursor = sal_True );
 voidHideCursor();
 
-EESelectionMode GetSelectionMode() const;
 voidSetSelectionMode( EESelectionMode eMode );
 
 voidSetReadOnly( sal_Bool bReadOnly );
@@ -133,10 +132,8 @@ public:
 voidSetVisArea( const Rectangle rRec );
 const RectangleGetVisArea() const;
 
-voidSetPointer( const Pointer rPointer );
 const Pointer  GetPointer() const;
 
-voidSetCursor( const Cursor rCursor );
 Cursor* GetCursor() const;
 
 voidInsertText( const String rNew, sal_Bool bSelect = 
sal_False );
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 0161eaa..50f96a2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1169,14 +1169,6 @@ ItemList::ItemList() : CurrentItem( 0 )
 {
 }
 
-const SfxPoolItem* ItemList::FindAttrib( sal_uInt16 nWhich )
-{
-for ( size_t i = 0, n = aItemPool.size(); i  n; ++i )
-if ( aItemPool[ i ]-Which() == nWhich )
-return aItemPool[ i ];
-return NULL;
-}
-
 const SfxPoolItem* ItemList::First()
 {
 CurrentItem = 0;
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 2b35c3e..32bfb24 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -187,7 +187,6 @@ private:
 
 public:
 ItemList();
-const SfxPoolItem*  FindAttrib( sal_uInt16 nWhich );
 const SfxPoolItem*  First();
 const SfxPoolItem*  Next();
 size_t  Count() { return aItemPool.size(); };
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index ee9f749..bff5f04 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -362,25 +362,12 @@ const Rectangle EditView::GetOutputArea() const
 return pImpEditView-GetOutputArea();
 }
 
-void EditView::SetPointer( const Pointer rPointer )
-{
-DBG_CHKTHIS( EditView, 0 );
-pImpEditView-SetPointer( rPointer );
-}
-
 const Pointer EditView::GetPointer() const
 {
 DBG_CHKTHIS( EditView, 0 );
 return pImpEditView-GetPointer();
 }
 
-void EditView::SetCursor( const Cursor rCursor )
-{
-DBG_CHKTHIS( EditView, 0 );
-delete pImpEditView-pCursor;
-pImpEditView-pCursor = new Cursor( rCursor );
-}
-
 Cursor* EditView::GetCursor() const
 {
 DBG_CHKTHIS( EditView, 0 );
@@ -629,12 +616,6 @@ Point EditView::GetWindowPosTopLeft( sal_uInt16 nParagraph 
)
 return pImpEditView-GetWindowPos( aDocPos );
 }
 
-EESelectionMode EditView::GetSelectionMode() const
-{
-DBG_CHKTHIS( EditView, 0 );
-return pImpEditView-GetSelectionMode();
-}
-
 void EditView::SetSelectionMode( EESelectionMode eMode )
 {
 DBG_CHKTHIS( EditView, 0 );
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx 
b/filter/inc/filter/msfilter/msdffimp.hxx
index 88a009e..e2d6ced 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -129,7 +129,6 @@ public:
 boolGetPropertyBool( sal_uInt32 nId, bool bDefault = false ) 
const;
 /** Returns a string property. */
 ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream rStrm ) const;
-voidSetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) 
const;
 sal_BoolSeekToContent( sal_uInt32 nRecType, SvStream rSt ) const;
 voidMerge( DffPropSet rMasterPropSet ) const;
 void

[Libreoffice-commits] .: editeng/inc editeng/source starmath/source svx/source sw/source

2011-12-23 Thread August Sodora 
 editeng/inc/editeng/editdata.hxx |4 -
 editeng/inc/editeng/editeng.hxx  |2 
 editeng/inc/editeng/editobj.hxx  |6 +-
 editeng/inc/editeng/unoedsrc.hxx |1 
 editeng/source/editeng/editeng.cxx   |5 -
 editeng/source/editeng/editobj.cxx   |8 +-
 editeng/source/editeng/editobj2.hxx  |2 
 editeng/source/editeng/impedit.hxx   |2 
 editeng/source/editeng/impedit5.cxx  |   11 ++-
 editeng/source/uno/unoedhlp.cxx  |   24 +++-
 editeng/source/uno/unofored.cxx  |   67 +---
 starmath/source/accessibility.cxx|   23 +++-
 svx/source/sdr/properties/textproperties.cxx |   25 +++--
 sw/source/filter/ww8/wrtw8esh.cxx|   75 +--
 sw/source/filter/ww8/wrtww8.hxx  |2 
 15 files changed, 90 insertions(+), 167 deletions(-)

New commits:
commit 4d4a67748e945d901f320d9c3af753abb3211efc
Author: August Sodora aug...@gmail.com
Date:   Fri Dec 23 02:30:41 2011 -0500

SV_DECL_VARARR-std::vector

diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index 4e0467f..2ac8a99 100644
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -33,8 +33,6 @@
 #include tools/string.hxx
 #include editeng/editengdllapi.h
 
-#include svl/svarray.hxx
-
 class SfxItemSet;
 class SfxPoolItem;
 class SvParser;
@@ -305,8 +303,6 @@ struct EECharAttrib
 xub_StrLen  nEnd;
 };
 
-SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, 
EDITENG_DLLPUBLIC )
-
 struct MoveParagraphsInfo
 {
 sal_uInt16  nStartPara;
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 88111b3..4c0d5e0 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -236,7 +236,7 @@ public:
 virtual voidSetParaAttribs( sal_uInt16 nPara, const 
SfxItemSet rSet );
 virtual const SfxItemSet   GetParaAttribs( sal_uInt16 nPara ) const;
 
-voidGetCharAttribs( sal_uInt16 nPara, EECharAttribArray 
rLst ) const;
+voidGetCharAttribs( sal_uInt16 nPara, 
std::vectorEECharAttrib rLst ) const;
 
 SfxItemSet  GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, 
sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
 SfxItemSet  GetAttribs( const ESelection rSel, sal_Bool 
bOnlyHardAttrib = EditEngineAttribs_All );
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 9834649..e3c9340 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -34,14 +34,16 @@
 #include rsc/rscsfx.hxx
 #include svl/itemset.hxx
 #include editeng/eeitem.hxx
+#include editeng/editdata.hxx
 #include editeng/editengdllapi.h
 
+#include vector
+
 DBG_NAMEEX( EE_EditTextObject )
 
 class SfxItemPool;
 class SfxStyleSheetPool;
 class SvxFieldItem;
-class EECharAttribArray;
 
 #define EDTOBJ_SETTINGS_ULITEMSUMMATION 0x0001
 #define EDTOBJ_SETTINGS_ULITEMFIRSTPARA 0x0002
@@ -96,7 +98,7 @@ public:
 virtual sal_BoolHasOnlineSpellErrors() const;
 
 virtual sal_BoolHasCharAttribs( sal_uInt16 nWhich = 0 ) const;
-virtual voidGetCharAttribs( sal_uInt16 nPara, EECharAttribArray 
rLst ) const;
+virtual voidGetCharAttribs( sal_uInt16 nPara, 
std::vectorEECharAttrib rLst ) const;
 
 virtual sal_BoolRemoveCharAttribs( sal_uInt16 nWhich = 0 );
 virtual sal_BoolRemoveParaAttribs( sal_uInt16 nWhich = 0 );
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index 3f45bae..7f31d37 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -55,7 +55,6 @@ class SvxViewForwarder;
 class SvxEditViewForwarder;
 class SvxFieldItem;
 class SfxBroadcaster;
-class EECharAttribArray;
 class SvxUnoTextRangeBase;
 
 typedef std::list SvxUnoTextRangeBase*  SvxUnoTextRangeBaseList;
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 0ce3ff2..2964ad4 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -97,7 +97,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
 
-
 DBG_NAME( EditEngine )
 DBG_NAMEEX( EditView )
 
@@ -105,8 +104,6 @@ DBG_NAMEEX( EditView )
 static sal_Bool bDebugPaint = sal_False;
 #endif
 
-SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
-
 static SfxItemPool* pGlobalPool=0;
 
 // --
@@ -1498,7 +1495,7 @@ const SfxPoolItem EditEngine::GetParaAttrib( sal_uInt16 
nPara, sal_uInt16 nWhic
 return pImpEditEngine-GetParaAttrib( nPara, nWhich );
 }
 
-void EditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray rLst ) 
const
+void EditEngine::GetCharAttribs(

[Libreoffice-commits] .: editeng/inc editeng/source

2011-12-23 Thread David Tardon 
 editeng/inc/editeng/svxacorr.hxx |2 +-
 editeng/source/misc/svxacorr.cxx |   13 +
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 80e977a34bd6eb1d3d3af849dcf86c5886c15a8f
Author: David Tardon dtar...@redhat.com
Date:   Sat Dec 24 06:38:12 2011 +0100

std::map* - std::map

diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index aabc644..e2a3a8c 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -209,7 +209,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 
 // all languages in a table
 SvxAutoCorrLanguageTable_Impl* pLangTable;
-std::mapLanguageType, long* pLastFileTable;
+std::mapLanguageType, long aLastFileTable;
 CharClass* pCharClass;
 
 bool bRunNext;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f28df9d..413c509 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -342,7 +342,6 @@ SvxAutoCorrect::SvxAutoCorrect( const String 
rShareAutocorrFile,
 : sShareAutoCorrFile( rShareAutocorrFile ),
 sUserAutoCorrFile( rUserAutocorrFile ),
 pLangTable( new SvxAutoCorrLanguageTable_Impl ),
-pLastFileTable( new std::mapLanguageType, long ),
 pCharClass( 0 ), bRunNext( false ),
 cStartDQuote( 0 ), cEndDQuote( 0 ), cStartSQuote( 0 ), cEndSQuote( 0 )
 {
@@ -359,7 +358,6 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect rCpy )
 aSwFlags( rCpy.aSwFlags ),
 
 pLangTable( new SvxAutoCorrLanguageTable_Impl ),
-pLastFileTable( new std::mapLanguageType, long ),
 pCharClass( 0 ), bRunNext( false ),
 
 nFlags( rCpy.nFlags  ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)),
@@ -374,7 +372,6 @@ SvxAutoCorrect::~SvxAutoCorrect()
 {
 lcl_ClearTable(*pLangTable);
 delete pLangTable;
-delete pLastFileTable;
 delete pCharClass;
 }
 
@@ -1616,8 +1613,8 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType 
eLang, sal_Bool bNewFi
 
 Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( 
Time::EMPTY );
 
-std::mapLanguageType, long::iterator nFndPos = 
pLastFileTable-find(eLang);
-if(nFndPos != pLastFileTable-end() 
+std::mapLanguageType, long::iterator nFndPos = 
aLastFileTable.find(eLang);
+if(nFndPos != aLastFileTable.end() 
(nLastCheckTime.SetTime(nFndPos-second), nLastCheckTime  nAktTime) 
nAktTime - nLastCheckTime  nMinTime)
 {
@@ -1629,7 +1626,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType 
eLang, sal_Bool bNewFi
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
 sUserDirFile, eLang );
 pLangTable-Insert( sal_uLong(eLang), pLists );
-pLastFileTable-erase(nFndPos);
+aLastFileTable.erase(nFndPos);
 }
 }
 else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
@@ -1640,11 +1637,11 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( 
LanguageType eLang, sal_Bool bNewFi
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
 sUserDirFile, eLang );
 pLangTable-Insert( sal_uLong(eLang), pLists );
-pLastFileTable-erase(nFndPos);
+aLastFileTable.erase(nFndPos);
 }
 else if( !bNewFile )
 {
-(*pLastFileTable)[eLang] = nAktTime.GetTime();
+aLastFileTable[eLang] = nAktTime.GetTime();
 }
 return pLists != 0;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/source unusedcode.easy

2011-11-03 Thread Jan Holesovsky 
 editeng/inc/editeng/editeng.hxx|   30 --
 editeng/source/editeng/editeng.cxx |  176 -
 unusedcode.easy|   25 -
 3 files changed, 1 insertion(+), 230 deletions(-)

New commits:
commit 46bc8b9027a6a68791973a3da702db39b3cd0e30
Author: Felix Zhang fezh...@suse.com
Date:   Thu Nov 3 15:59:37 2011 +0800

remove unused methods in EditEngine

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 0db0464..f23223e 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -135,7 +135,6 @@ public:
 const SfxItemSet   GetEmptyItemSet();
 
 voidSetDefTab( sal_uInt16 nDefTab );
-sal_uInt16  GetDefTab() const;
 
 voidSetRefDevice( OutputDevice* pRefDef );
 OutputDevice*   GetRefDevice() const;
@@ -150,7 +149,6 @@ public:
 Color   GetBackgroundColor() const;
 Color   GetAutoColor() const;
 voidEnableAutoColor( sal_Bool b );
-sal_BoolIsAutoColorEnabled() const;
 voidForceAutoColor( sal_Bool b );
 sal_BoolIsForceAutoColor() const;
 
@@ -161,7 +159,6 @@ public:
 sal_uInt16  GetViewCount() const;
 sal_BoolHasView( EditView* pView ) const;
 EditView*   GetActiveView() const;
-voidSetActiveView( EditView* pView );
 
 voidSetPaperSize( const Size rSize );
 const Size GetPaperSize() const;
@@ -170,7 +167,6 @@ public:
 sal_BoolIsVertical() const;
 
 voidSetFixedCellHeight( sal_Bool bUseFixedCellHeight );
-sal_BoolIsFixedCellHeight() const;
 
 voidSetDefaultHorizontalTextDirection( 
EEHorizontalTextDirection eHTextDir );
 EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const;
@@ -181,18 +177,14 @@ public:
 voidTransliterateText( const ESelection rSelection, sal_Int32 
nTransliterationMode );
 
 voidSetAsianCompressionMode( sal_uInt16 nCompression );
-sal_uInt16  GetAsianCompressionMode() const;
 
 voidSetKernAsianPunctuation( sal_Bool bEnabled );
-sal_BoolIsKernAsianPunctuation() const;
 
 voidSetAddExtLeading( sal_Bool b );
-sal_BoolIsAddExtLeading() const;
 
 voidSetPolygon( const basegfx::B2DPolyPolygon 
rPolyPolygon );
 voidSetPolygon( const basegfx::B2DPolyPolygon 
rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
 voidClearPolygon();
-const PolyPolygon*  GetPolygon();
 
 const Size GetMinAutoPaperSize() const;
 voidSetMinAutoPaperSize( const Size rSz );
@@ -218,7 +210,6 @@ public:
 voidGetLineBoundaries( /*out*/sal_uInt16 rStart, 
/*out*/sal_uInt16 rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
 sal_uInt16  GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 
nIndex ) const;
 sal_uInt32  GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine = 0 
);
-sal_uInt16  GetFirstLineOffset( sal_uInt16 nParagraph );
 ParagraphInfos  GetParagraphInfos( sal_uInt16 nPara );
 sal_uInt16  FindParagraph( long nDocPosY );
 EPosition   FindDocPosition( const Point rDocPos ) const;
@@ -227,7 +218,6 @@ public:
 String  GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
 
 ESelection  GetWord( const ESelection rSelection, sal_uInt16 
nWordType ) const;
-ESelection  SelectSentence( const ESelection rCurSel ) const;
 
 voidClear();
 voidSetText( const String rStr );
@@ -241,7 +231,6 @@ public:
 voidInsertParagraph( sal_uInt16 nPara, const EditTextObject 
rTxtObj );
 voidInsertParagraph( sal_uInt16 nPara, const String rText);
 
-voidSetText( sal_uInt16 nPara, const EditTextObject rTxtObj );
 voidSetText( sal_uInt16 nPara, const String rText);
 
 virtual voidSetParaAttribs( sal_uInt16 nPara, const 
SfxItemSet rSet );
@@ -261,7 +250,6 @@ public:
 voidRemoveAttribs( const ESelection rSelection, sal_Bool 
bRemoveParaAttribs, sal_uInt16 nWhich );
 
 voidShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow = 
sal_True );
-sal_BoolIsParagraphVisible( sal_uInt16 nParagraph );
 
 ::svl::IUndoManager
 GetUndoManager();
@@ -285,7 +273,6 @@ public:
 LinkGetModifyHdl() const;
 
 sal_BoolIsInSelectionMode() const;
-voidStopSelectionMode();
 
 voidStripPortions();
 voidGetPortions( sal_uInt16 nPara, std::vectorsal_uInt16 
rList );
@@ -347,12 +334,6 @@ public:
 voidSetWordDelimiters( const String rDelimiters );
 String

[Libreoffice-commits] .: editeng/inc editeng/source

2011-10-24 Thread Andras Timar 
 editeng/inc/editeng/svxacorr.hxx |2 +-
 editeng/source/misc/svxacorr.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d330483ad0106a750dec560b987c21aaa5394ab6
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 24 11:01:36 2011 +0200

autocorrect: non-breaking space before % in French fdo#41015

diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 0659b73..dd83531 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -53,7 +53,7 @@ class Window;
 // Auto correct flags
 const long CptlSttSntnc = 0x0001;   // Capital letters at the 
beginning of a sentence
 const long CptlSttWrd   = 0x0002;   // not two Capital letters at the 
beginning of a word
-const long AddNonBrkSpace   = 0x0004;   // Add non breaking space before 
:;?!
+const long AddNonBrkSpace   = 0x0004;   // Add non breaking space before 
:;?!%
 const long ChgOrdinalNumber = 0x0008;   // Ordinal-Number 1st, 2nd,..
 const long ChgToEnEmDash= 0x0010;   // - - Endash/Emdash
 const long ChgWeightUnderl  = 0x0020;   // * - Bold, _ - Underscore
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7e53771..9c74713 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -297,14 +297,14 @@ sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode 
cChar )
 {
 return  cChar == '\0' || cChar == '\t' || cChar == 0x0a ||
 cChar == ' '  || cChar == '\'' || cChar == '\' ||
-cChar == '*'  || cChar == '_'  ||
+cChar == '*'  || cChar == '_'  || cChar == '%' ||
 cChar == '.'  || cChar == ','  || cChar == ';' ||
 cChar == ':'  || cChar == '?' || cChar == '!' || cChar == '/';
 }
 
 sal_Bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
 {
-return cChar == ';' || cChar == ':'  || cChar == '?' || cChar == '!' ||
+return cChar == '%' || cChar == ';' || cChar == ':'  || cChar == '?' || 
cChar == '!' ||
 cChar == '/' /*case for the urls exception*/;
 }
 
@@ -661,7 +661,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
 if ( rLocale.Language == OUString(RTL_CONSTASCII_USTRINGPARAM( fr )) )
 {
 bool bFrCA = rLocale.Country == OUString(RTL_CONSTASCII_USTRINGPARAM( 
CA ));
-OUString allChars = OUString(RTL_CONSTASCII_USTRINGPARAM( :;!? ));
+OUString allChars = OUString(RTL_CONSTASCII_USTRINGPARAM( :;?!% ));
 OUString chars( allChars );
 if ( bFrCA )
 chars = OUString(RTL_CONSTASCII_USTRINGPARAM( : ));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits