accessibility/source/extended/textwindowaccessibility.cxx | 10 ++++++++--
editeng/source/outliner/outlvw.cxx | 3 +--
editeng/source/uno/unoipset.cxx | 3 +--
sd/uiconfig/sdraw/menubar/menubar.xml | 1 +
sw/uiconfig/swriter/menubar/menubar.xml | 1 +
5 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 316a0487dcf9bb15db159552e70dbfc43b785618
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Oct 28 09:45:59 2012 +0100
Variable X is reassigned a value before the old one has been used
Change-Id: I196145550e5f0e53f9498ddd127fec588be064b9
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 68922aa..714f350 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1258,10 +1258,9 @@ sal_uLong OutlinerView::Read( SvStream& rInput, const
String& rBaseURL, EETextF
{
if ( eFormat == EE_FORMAT_BIN )
{
- sal_uInt16 nDepth = 0;
const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n );
const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get(
EE_PARA_OUTLLEVEL );
- nDepth = rLevel.GetValue();
+ sal_uInt16 nDepth = rLevel.GetValue();
pOwner->ImplInitDepth( n, nDepth, sal_False );
}
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index a99ee1a..db19edd 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -167,7 +167,6 @@ void SvxItemPropertySet::setPropertyValue( const
SfxItemPropertySimpleEntry* pMa
// Get item
const SfxPoolItem* pItem = 0;
- SfxPoolItem *pNewItem = 0;
SfxItemState eState = rSet.GetItemState( pMap->nWID, sal_True, &pItem );
SfxItemPool* pPool = rSet.GetPool();
@@ -197,7 +196,7 @@ void SvxItemPropertySet::setPropertyValue( const
SfxItemPropertySimpleEntry* pMa
SvxUnoConvertFromMM( eMapUnit, aValue );
}
- pNewItem = pItem->Clone();
+ SfxPoolItem *pNewItem = pItem->Clone();
sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
if( eMapUnit == SFX_MAPUNIT_100TH_MM )
commit bf7240d0676b4350892e01fa8c1ba5eb6a3913c6
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Oct 28 01:57:34 2012 +0200
Resolves: fdo#56473 IDE: Crash when inserting a simple macro
Change-Id: I7bb6fe0005b9afa2d853a13a30d5b0c48ba8bdf2
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 9f48b1a..620ff0f 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2126,8 +2126,14 @@ void Document::notifySelectionChange( sal_Int32 nFirst,
sal_Int32 nLast )
{
if ( nFirst < nLast )
{
- Paragraphs::iterator aEnd( ::std::min( m_xParagraphs->begin() + nLast,
m_aVisibleEnd ) );
- for ( Paragraphs::iterator aIt = ::std::max( m_xParagraphs->begin() +
nFirst, m_aVisibleBegin ); aIt < aEnd; ++aIt )
+ Paragraphs::iterator aItBound1 = m_xParagraphs->begin();
+ for (sal_Int32 i = 0; i < nLast && aItBound1 != m_xParagraphs->end()
; ++aItBound1);
+ Paragraphs::iterator aEnd( ::std::min( aItBound1, m_aVisibleEnd ) );
+
+ Paragraphs::iterator aItBound2 = m_xParagraphs->begin();
+ for (sal_Int32 i = 0; i < nFirst && aItBound2 != m_xParagraphs->end()
; ++aItBound2);
+
+ for ( Paragraphs::iterator aIt = ::std::max( aItBound2,
m_aVisibleBegin ); aIt != aEnd; ++aIt )
{
::rtl::Reference< ParagraphImpl > xParagraph( getParagraph( aIt )
);
if ( xParagraph.is() )
commit cf0453d94b1af305ee385e9e2522bcc5e589530e
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Oct 27 23:20:59 2012 +0200
Resolves: fdo#38193 WRITER, DRAW: Media Player is missing in Tools menu
Change-Id: I0952292ebf1a04743f2bc534c2cfe282b516eedd
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index ec84a44..8dcff8f 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -235,6 +235,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Gallery"/>
<menu:menuitem menu:id=".uno:BmpMask"/>
+ <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:MacrosMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index b71b33e..29add74 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -419,6 +419,7 @@
<menu:menuitem menu:id=".uno:FootnoteDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Gallery"/>
+ <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:BibliographyComponent"/>
<menu:menuseparator/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
