graphite/graphite-2.3.1.patch | 20 ++++++++++++++++++++ sw/source/core/access/accportions.cxx | 2 +- sw/source/core/access/acctable.cxx | 2 +- sw/source/core/crsr/crsrsh.cxx | 1 - sw/source/core/docnode/node.cxx | 2 +- sw/source/core/fields/expfld.cxx | 2 +- sw/source/ui/index/cnttab.cxx | 2 +- sw/source/ui/uiview/view.cxx | 6 +++--- sw/source/ui/utlui/content.cxx | 1 - 9 files changed, 28 insertions(+), 10 deletions(-)
New commits: commit 21745044cbac84fdf38bbf45c96338b11953897f Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:36:54 2013 +0000 WaE: Remove unused variable. diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 11e3740..08e00dd 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2714,7 +2714,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) SwContent* pCnt = (SwContent*)pEntry->GetUserData(); - sal_Bool bSel = sal_False; sal_uInt16 nJumpType = pCnt->GetParent()->GetType(); switch(nJumpType) { commit 4956355877b7c9368f99ef4a91b6a1805ceac32c Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:35:48 2013 +0000 WaE: reorder initializations properly to prevent compiler warnings. diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index cce9c32..eedcd04 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -727,6 +727,9 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) : SfxViewShell( _pFrame, SWVIEWFLAGS ), aPageStr( SW_RES( STR_PAGE )), nNewPage(USHRT_MAX), + //IAccessibility2 Implementation 2009----- + nOldPageNum(0), + //-----IAccessibility2 Implementation 2009 pNumRuleNodeFromDoc(0), // #i23726# pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ), pWrtShell(0), @@ -763,9 +766,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) nFormSfxId( USHRT_MAX ), nLastPasteDestination( 0xFFFF ), nLeftBorderDistance( 0 ), - //IAccessibility2 Implementation 2009----- - nOldPageNum(0), - //-----IAccessibility2 Implementation 2009 nRightBorderDistance( 0 ), bInMailMerge(sal_False), bInDtor(sal_False), commit e23ad02d49504ff89e7a4fe68e49bb758854eeaf Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:34:44 2013 +0000 WaE: unname unused argument to prevent compiler warnings. diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index c789f38..b87e317 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -4053,7 +4053,7 @@ void SwTokenWindow::SetFocus2theAllBtn() m_pParent->SetFocus2theAllBtn(); } } -sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control* pCurControl) const +sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control* /* pCurControl */) const { //there are only one entry-text button and only one page-number button, //so we need not add index for these two buttons. commit 81626b7c35790ca326c220108695730ea7a200b1 Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:31:30 2013 +0000 WaE: reorder initializations properly to prevent compiler warnings. diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 253e9aa..6274bd8d 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1155,8 +1155,8 @@ SwInputField::SwInputField( SwInputFieldType* pFieldType, , aContent(rContent) , aPText(rPrompt) , nSubType(nSub) - , mpFmtFld( NULL ) , mbIsFormField( bIsFormField ) + , mpFmtFld( NULL ) { } commit 1bf8fcfd6fd447af3c24ffd41955a3ca2fb21356 Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:30:18 2013 +0000 WaE: unname unused argument to prevent compiler warnings. diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 55d8b08..302fe2a 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1374,7 +1374,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode ) //Solution:Add a input param to identify if the acc table should be disposed. //add a flag(bNeedDel) to indicate whether to del corresponding frm even in doc loading process, //void SwCntntNode::DelFrms() -void SwCntntNode::DelFrms( sal_Bool bNeedDel, sal_Bool bIsDisposeAccTable ) +void SwCntntNode::DelFrms( sal_Bool /* bNeedDel */, sal_Bool bIsDisposeAccTable ) //-----IAccessibility2 Implementation 2009 { if( !GetDepends() ) commit 255ab8c307c82b4c7b3379a3509e56e304eb475f Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:29:03 2013 +0000 WaE: Remove unused variable. diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index b6375c6..e0936bb 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -452,7 +452,6 @@ void SwCrsrShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNew bool SwCrsrShell::bColumnChange() { - sal_uInt16 nCurrCol = 0; SwFrm* pCurrFrm = GetCurrFrm(sal_False); if (pCurrFrm == NULL) commit 40b6e291c04205d1c4287e6ea602772c69f0e015 Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:27:05 2013 +0000 WaE: unsigned const to prevent compiler warnings. diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 3da5bec..4e978e6 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -72,7 +72,7 @@ typedef ::std::set < sal_Int32, Int32Less_Impl > Int32Set_Impl; typedef ::std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl; typedef ::std::list < Int32Pair_Impl > Int32PairList_Impl; -const int SELECTION_WITH_NUM =10; +const unsigned int SELECTION_WITH_NUM = 10; class SwAccTableSelHander_Impl { commit 5eb6ba312a621473083afa8129e123941c314ee7 Author: Pavel JanÃk <[email protected]> Date: Wed Nov 27 09:25:37 2013 +0000 WaE: compare unsigned values to prevent compiler warnings. diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 64d6dab..f57c03a 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -849,7 +849,7 @@ sal_Int32 SwAccessiblePortionData::GetFieldIndex(sal_Int32 nPos) sal_Int32 nIndex = -1; if( aFieldPosition.size() >= 2 ) { - for( sal_Int32 i = 0; i < aFieldPosition.size() - 1; i += 2 ) + for( sal_uInt32 i = 0; i < aFieldPosition.size() - 1; i += 2 ) { if( nPos <= aFieldPosition[ i + 1 ] && nPos >= aFieldPosition[ i ] ) { commit 9bbfae5c7597ec24c04e3becb32ee73b230c549f Author: Herbert Dürr <[email protected]> Date: Wed Nov 27 08:44:46 2013 +0000 #i122208# allow silgraphite build with a move-semantic enabled STL by fixing the non-canonical copy constructor of gr::Segment() diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch index 508226a..aca7337 100644 --- a/graphite/graphite-2.3.1.patch +++ b/graphite/graphite-2.3.1.patch @@ -2360,6 +2360,17 @@ { } +--- misc/silgraphite-2.3.1/engine/include/graphite/Segment.h 2009-01-29 09:33:19.000000000 +0100 ++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h 2013-08-14 15:10:53.363864046 +0200 +@@ -64,7 +64,7 @@ + virtual ~Segment(); + + // Basic copy constructor: +- Segment(Segment & seg); ++ Segment( const Segment&); + + // For making modified copies of segments: + static Segment * LineContextSegment(Segment & seg, bool fStartLine, bool fEndLine); --- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak 2010-06-23 19:59:54.611660400 +0700 +++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp 2010-06-23 21:30:16.335460400 +0700 @@ -246,6 +246,8 @@ @@ -2371,6 +2382,15 @@ // m_psstrm = NULL; m_prgslout = NULL; +@@ -435,7 +435,7 @@ + /*---------------------------------------------------------------------------------------------- + Basic copy method. + ----------------------------------------------------------------------------------------------*/ +-Segment::Segment(Segment & seg) ++Segment::Segment( const Segment& seg) + { + int islout; + @@ -2988,9 +2988,10 @@ return kresOk; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
