[Libreoffice-commits] .: editeng/source
editeng/source/items/frmitems.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1489254311e75a379a129bceeab49643ebea04e0
Author: Dezsi Szabolcs dezsisz...@hotmail.com
Date: Fri Apr 20 14:10:56 2012 +0530
fdo#47436: Fixed crash while opening odt file.
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index efdcadb..d4b876b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1951,7 +1951,8 @@ bool SvxBoxItem::PutValue( const uno::Any rVal,
sal_uInt8 nMemberId )
for (int n(0); n != SAL_N_ELEMENTS(aBorders); ++n)
{
editeng::SvxBorderLine* pLine = const_cast
editeng::SvxBorderLine* ( GetLine( aBorders[n] ) );
-pLine-SetStyle( eBorderStyle );
+if( pLine )
+pLine-SetStyle( eBorderStyle );
}
return sal_True;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25de2a561b8f2618c2fa42dab39f57c727ce03e5
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 16 15:52:46 2012 +0200
Corret size_t format specifier
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 98b4e9c..79c2c14 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
fprintf( fp, \nMinAutoPaperSize: %li x %li,
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRI_SIZET i, pEE-GetViewCount()
);
for ( sal_uInt16 nView = 0; nView pEE-GetViewCount(); nView++ )
{
EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit daae05ccf52e37afc41dc1976afcc1f7c6fd978c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 10:05:34 2012 +0200
WaE fix
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index af2e37f..98b4e9c 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
fprintf( fp, \nMinAutoPaperSize: %li x %li,
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: %i, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
for ( sal_uInt16 nView = 0; nView pEE-GetViewCount(); nView++ )
{
EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 95cc5de63b20c5986fe8f3913da86002eabd7cb1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 18:06:08 2012 +0200
Resolves: fdo#48683 nice crash when hitting DEL
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 0d6877b..5ea5d71 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2436,7 +2436,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
// Remove portion;
sal_uInt8 nType = pTP-GetKind();
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pTP;
if ( nType == PORTIONKIND_LINEBREAK )
{
TextPortion* pNext = pParaPortion-GetTextPortions()[ nPortion
];
@@ -2444,7 +2443,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Remove dummy portion
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pNext;
}
}
}
@@ -2462,7 +2460,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Discard portion; if possible, correct the ones before,
// if the Hyphenator portion has swallowed one character...
-pParaPortion-GetTextPortions().Remove( nLastPortion );
if ( nLastPortion pTP-GetLen() )
{
TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
@@ -2470,7 +2467,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
pPrev-GetSize().Width() = (-1);
}
-delete pTP;
+pParaPortion-GetTextPortions().Remove( nLastPortion );
}
}
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a78a7ee9f7b1db56a6fa7e082f410db5a8db2f18
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 11 15:36:00 2012 -0400
Do this special case search only when the array is large enough.
Otherwise the normal linear search should be sufficient. Eventually
we need to use a better algorithm here than this special case handling...
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index f797d24..c791aa2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -688,7 +688,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
// Through certain filter code-paths we do a lot of appends, which in
// turn call GetPos - creating some N^2 nightmares. If we have a
// non-trivially large list, do a few checks from the end first.
-if (rLastPos 16)
+if (rLastPos 16 nArrayLen 16)
{
size_t nEnd;
if (rLastPos nArrayLen - 2)
@@ -698,7 +698,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
for (size_t nIdx = rLastPos - 2; nIdx nEnd; ++nIdx)
{
-if (rArray[nIdx] == p)
+if (rArray.at(nIdx) == p)
{
rLastPos = nIdx;
return nIdx;
@@ -707,7 +707,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
}
// The world's lamest linear search from svarray ...
for (size_t nIdx = 0; nIdx nArrayLen; ++nIdx)
-if (rArray[nIdx] == p)
+if (rArray.at(nIdx) == p)
return rLastPos = nIdx;
// 0x is used to signify not found condition. We need to change this.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source slideshow/source xmlsecurity/source
editeng/source/editeng/impedit3.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a16060116346533923c607bd406d3fea511b41ec
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 01:01:31 2012 +0200
Fix Prefer prefix ++/-- operators
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a380c08..46cfe04 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2349,7 +2349,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
DBG_ASSERT( (nInvPos != aPositions.end()), InvPos ?! );
::std::set sal_uInt32 ::iterator i = nInvPos;
-i++;
+++i;
while ( i != aPositions.end() )
{
TextPortion* pNew = new TextPortion( static_castsal_uInt16(*i++) -
static_castsal_uInt16(*nInvPos++) );
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index ca91a6c..7718019 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -902,7 +902,7 @@ PolygonMap::iterator SlideShowImpl::findPolygons(
uno::Referencedrawing::XDrawP
if(aIter-first == xDrawPage)
bFound = true;
else
-aIter++;
+++aIter;
}
return aIter;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 7523bf1..8b10f03 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -374,7 +374,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
//find the file in the element list
typedef ::std::vector ::rtl::OUString ::const_iterator CIT;
-for (CIT aIter = sElementList.begin(); aIter sElementList.end();
aIter++)
+for (CIT aIter = sElementList.begin(); aIter !=
sElementList.end(); ++aIter)
{
::rtl::OUString sElementListURI = *aIter;
if (alg == OOo2Document)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit e0fd2c61e47c994d050d9afcb9578e096e1489b6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 4 16:22:32 2012 -0400
dbgutil fix.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 9142ec1..c1ef702 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -334,13 +334,14 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE,
sal_Bool bInfoBox )
fprintf( fp,
\n
);
for ( sal_uInt16 nPortion = 0; nPortion
pEE-pImpEditEngine-GetParaPortions(). Count(); 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, \nParagraph %i: Length = %i, Invalid = %i\nText = '%s',
+ nPortion, pPPortion-GetNode()-Len(), pPPortion-IsInvalid(),
+ rtl::OUStringToOString(pPPortion-GetNode()-GetString(),
RTL_TEXTENCODING_UTF8).getStr() );
fprintf( fp, \nVorlage: );
SfxStyleSheet* pStyle = pPPortion-GetNode()-GetStyleSheet();
if ( pStyle )
-fprintf( fp, %s, rtl::OUStringToOString( pStyle-GetName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
+fprintf( fp, %s, rtl::OUStringToOString( pStyle-GetName(),
RTL_TEXTENCODING_UTF8).getStr() );
fprintf( fp, \nParagraph attribute: );
DbgOutItemSet( fp,
pPPortion-GetNode()-GetContentAttribs().GetItems(), sal_False, sal_False );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2c4e811049e9f2cad823e372a01a5afc09ead25c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 11:44:06 2012 -0400
Fix the dbgutil build.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 48f6e00..9142ec1 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -384,7 +384,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
sal_uLong n = 0;
for ( z = 0; z nTextPortions; z++ )
{
-TextPortion* pPortion = pPPortion-GetTextPortions().GetObject( z
);
+TextPortion* pPortion = pPPortion-GetTextPortions()[z];
aPortionStr.append(' ');
aPortionStr.append(static_castsal_Int32(pPortion-GetLen()));
aPortionStr.append('(');
@@ -409,7 +409,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
sal_uInt16 nLine;
for ( nLine = 0; nLine pPPortion-GetLines().Count(); nLine++ )
{
-EditLine* pLine = pPPortion-GetLines().GetObject( nLine );
+EditLine* pLine = pPPortion-GetLines()[nLine];
rtl::OString
aLine(rtl::OUStringToOString(pPPortion-GetNode()-Copy(pLine-GetStart(),
pLine-GetEnd() - pLine-GetStart()), RTL_TEXTENCODING_ASCII_US));
fprintf( fp, \nLine %i\t%s, nLine, aLine.getStr() );
@@ -417,7 +417,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
// then the internal data ...
for ( nLine = 0; nLine pPPortion-GetLines().Count(); nLine++ )
{
-EditLine* pLine = pPPortion-GetLines().GetObject( nLine );
+EditLine* pLine = pPPortion-GetLines()[nLine];
fprintf( fp, \nZeile %i:\tStart: %i,\tEnd: %i, nLine,
pLine-GetStart(), pLine-GetEnd() );
fprintf( fp, \t\tPortions: %i - %i.\tHight: %i, Ascent=%i,
pLine-GetStartPortion(), pLine-GetEndPortion(), pLine-GetHeight(),
pLine-GetMaxAscent() );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97bcf0b645fa5ce14cfd806548c6805952fd3e76
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 11:51:18 2012 -0400
WaE: for Norbert's Mac OS tinderbox.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 6a01a0f..ec74f29 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3965,7 +3965,7 @@ long ImpEditEngine::GetXPos(
// End of Portion
if ( pPortion-GetKind() == PORTIONKIND_TAB )
{
-if ( (nTextPortion+1)
pParaPortion-GetTextPortions().Count() )
+if ( static_castsize_t(nTextPortion+1)
pParaPortion-GetTextPortions().Count() )
{
const TextPortion* pNextPortion =
pParaPortion-GetTextPortions()[nTextPortion+1];
if ( pNextPortion-GetKind() != PORTIONKIND_TAB )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |2 +-
editeng/source/editeng/impedit4.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 881fa8d5cbb937b033f87f7da813419895b31b28
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 13:15:57 2012 -0400
More dbgutil build fix.
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 091c329..83396c9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1697,7 +1697,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine(
ParaPortion* pParaPortion, sal_uIn
{
// -2: The new one is already inserted.
#ifdef DBG_UTIL
-EditLine* pLastLine = pParaPortion-GetLines().GetObject(
pParaPortion-GetLines().Count()-2 );
+EditLine* pLastLine =
pParaPortion-GetLines()[pParaPortion-GetLines().Count()-2];
DBG_ASSERT( pLastLine, soft wrap no line?! );
DBG_ASSERT( pLastLine-GetEnd() == pParaPortion-GetNode()-Len(),
different anyway? );
#endif
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index dd45a57..63b9402 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1167,9 +1167,9 @@ EditTextObject* ImpEditEngine::CreateBinTextObject(
EditSelection aSel, SfxItemP
sal_uInt16 nTest;
int nTPLen = 0, nTxtLen = 0;
for ( nTest = pParaPortion-GetTextPortions().Count(); nTest; )
-nTPLen += pParaPortion-GetTextPortions().GetObject( --nTest
)-GetLen();
+nTPLen += pParaPortion-GetTextPortions()[--nTest]-GetLen();
for ( nTest = pParaPortion-GetLines().Count(); nTest; )
-nTxtLen += pParaPortion-GetLines().GetObject( --nTest
)-GetLen();
+nTxtLen += pParaPortion-GetLines()[--nTest]-GetLen();
DBG_ASSERT( ( nTPLen == pParaPortion-GetNode()-Len() ) (
nTxtLen == pParaPortion-GetNode()-Len() ), CreateBinTextObject: ParaPortion
not completely formatted! );
#endif
}
@@ -1363,9 +1363,9 @@ EditSelection ImpEditEngine::InsertBinTextObject(
BinTextObject rTextObject, Ed
sal_uInt16 nTest;
int nTPLen = 0, nTxtLen = 0;
for ( nTest = pParaPortion-GetTextPortions().Count(); nTest; )
-nTPLen += pParaPortion-GetTextPortions().GetObject(
--nTest )-GetLen();
+nTPLen +=
pParaPortion-GetTextPortions()[--nTest]-GetLen();
for ( nTest = pParaPortion-GetLines().Count(); nTest; )
-nTxtLen += pParaPortion-GetLines().GetObject( --nTest
)-GetLen();
+nTxtLen += pParaPortion-GetLines()[--nTest]-GetLen();
DBG_ASSERT( ( nTPLen == pParaPortion-GetNode()-Len() ) (
nTxtLen == pParaPortion-GetNode()-Len() ), InsertBinTextObject: ParaPortion
not completely formatted! );
#endif
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit e7e882715872303dc8feabc899ceab572d1c2337
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 13:53:15 2012 -0400
Unused local variables.
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index b01c830..d3268ce 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -491,7 +491,6 @@ void ImpEditView::ResetOutputArea( const Rectangle rRec )
void ImpEditView::RecalcOutputArea()
{
-Rectangle aOldArea( aOutArea );
Point aNewTopLeft( aOutArea.TopLeft() );
Size aNewSz( aOutArea.GetSize() );
@@ -886,7 +885,6 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8
nRangeCheck )
#endif
Rectangle aNewVisArea( GetVisDocArea() );
-Size aPaperSz( pEditEngine-pImpEditEngine-GetPaperSize() );
// Vertical:
if ( !IsVertical() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit e5d378b1ba04c470e0c6c16b48af97ab5818e2bb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 18:26:29 2012 -0400
Check for empty-ness of vector before accessing the first element.
I hope this will keep Stephan's tinderbox happy. If not...
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 83396c9..4e9c393 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1241,7 +1241,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
if ( bCompressedChars pPortion ( pPortion-GetLen() 1 )
pPortion-GetExtraInfos() pPortion-GetExtraInfos()-bCompressed )
{
// I need the manipulated DXArray for determining the break
postion...
-sal_Int32* pDXArray = pLine-GetCharPosArray()[0] +
(nPortionStart - pLine-GetStart());
+sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0] + (nPortionStart -
pLine-GetStart());
ImplCalcAsianCompression(
pNode, pPortion, nPortionStart, pDXArray, 1, true);
}
@@ -2997,7 +2999,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
aText = *pPortion-GetNode();
nTextStart = nIndex;
nTextLen = pTextPortion-GetLen();
-pDXArray = pLine-GetCharPosArray()[0]+(
nIndex-pLine-GetStart() );
+if (!pLine-GetCharPosArray().empty())
+pDXArray =
pLine-GetCharPosArray()[0]+( nIndex-pLine-GetStart() );
// Paint control characters (#i55716#)
if ( aStatus.MarkFields() )
@@ -4457,7 +4460,9 @@ void ImpEditEngine::ImplExpandCompressedPortions(
EditLine* pLine, ParaPortion*
size_t nTxtPortion = pParaPortion-GetTextPortions().GetPos(
pTP );
sal_uInt16 nTxtPortionStart =
pParaPortion-GetTextPortions().GetStartPos( nTxtPortion );
DBG_ASSERT( nTxtPortionStart = pLine-GetStart(), Portion
doesn't belong to the line!!! );
-sal_Int32* pDXArray = pLine-GetCharPosArray()[0]+(
nTxtPortionStart-pLine-GetStart() );
+sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0]+(
nTxtPortionStart-pLine-GetStart() );
if ( pTP-GetExtraInfos()-pOrgDXArray )
memcpy( pDXArray, pTP-GetExtraInfos()-pOrgDXArray,
(pTP-GetLen()-1)*sizeof(sal_Int32) );
ImplCalcAsianCompression( pParaPortion-GetNode(), pTP,
nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 71da75abda60172ee9b8f42c1bf5de2f48a731b9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 18:45:55 2012 -0400
I need to check for empty-ness here too.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index ec74f29..ecb4a89 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4021,7 +4021,9 @@ long ImpEditEngine::GetXPos(
if ( nType == CHAR_PUNCTUATIONRIGHT )
{
sal_uInt16 n = nIndex - nTextPortionStart;
-const sal_Int32* pDXArray =
pLine-GetCharPosArray()[0]+( nTextPortionStart-pLine-GetStart() );
+const sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0]+(
nTextPortionStart-pLine-GetStart() );
sal_Int32 nCharWidth = ( ( (n+1)
pPortion-GetLen() ) ? pDXArray[n] : pPortion-GetSize().Width() )
- ( n ?
pDXArray[n-1] : 0 );
if ( (n+1) pPortion-GetLen() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editattr.cxx | 10 --
editeng/source/editeng/editattr.hxx |4 +---
editeng/source/editeng/editdoc.cxx |2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit d52d301660df47527a69c12bca49bb4e0199b4f5
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 16:36:01 2012 +0200
avoid sc crashes
Boost is reportedly 'expertly designed C++ library', so why do I
find the idea of a container containing pointers but exposing them
by value to be rather retarded? I don't know why exactly this
crashes, but I expect std::sort() either either does unwanted
copies that break things or the copies slice off inherited classes.
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index 171eb36..2e79644 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -66,12 +66,6 @@ EditAttrib::EditAttrib( const SfxPoolItem rAttr )
pItem = rAttr;
}
-EditAttrib::EditAttrib(const EditAttrib r) :
-pItem(r.pItem)
-{
-DBG_CTOR( EE_EditAttrib, 0 );
-}
-
EditAttrib::~EditAttrib()
{
DBG_DTOR( EE_EditAttrib, 0 );
@@ -88,10 +82,6 @@ EditCharAttrib::EditCharAttrib( const SfxPoolItem rAttr,
sal_uInt16 nS, sal_uIn
DBG_ASSERT( ( rAttr.Which() EE_FEATURE_START ) || ( rAttr.Which()
EE_FEATURE_END ) || ( nE == (nS+1) ), EditCharAttrib CTOR: Invalid feature! );
}
-EditCharAttrib::EditCharAttrib(const EditCharAttrib r) :
-EditAttrib(r),
-nStart(r.nStart), nEnd(r.nEnd), bFeature(r.bFeature), bEdge(r.bEdge) {}
-
void EditCharAttrib::SetFont( SvxFont, OutputDevice* )
{
}
diff --git a/editeng/source/editeng/editattr.hxx
b/editeng/source/editeng/editattr.hxx
index 0ad35a2..5855e47 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -68,7 +68,7 @@ class SfxVoidItem;
// -
// class EditAttrib
// -
-class EditAttrib
+class EditAttrib : public boost::noncopyable
{
private:
EditAttrib();
@@ -77,7 +77,6 @@ protected:
const SfxPoolItem* pItem;
EditAttrib( const SfxPoolItem rAttr );
-EditAttrib(const EditAttrib r);
virtual ~EditAttrib();
public:
@@ -104,7 +103,6 @@ protected:
public:
EditCharAttrib( const SfxPoolItem rAttr, sal_uInt16 nStart, sal_uInt16
nEnd );
-EditCharAttrib(const EditCharAttrib r);
sal_uInt16 GetStart() { return nStart; }
sal_uInt16 GetEnd(){ return nEnd; }
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 6b35b47..86a709b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2005,7 +2005,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib*
pAttrib )
void CharAttribList::ResortAttribs()
{
-std::sort(aAttribs.begin(), aAttribs.end(), LessByStart());
+aAttribs.sort(LessByStart());
}
void CharAttribList::OptimizeRanges( SfxItemPool rItemPool )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |9 -
editeng/source/editeng/editdoc.hxx |4
editeng/source/editeng/editdoc2.cxx |8
editeng/source/editeng/impedit2.cxx |7 ---
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 46da0b6837bffa7d8a72624d2587159737e3d7e2
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 23:32:21 2012 +0200
further sc/editeng unbreaking
this boost::ptr_vector idea is seriously broken
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 51f0112..c05e379 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1816,7 +1816,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode,
sal_uInt16 nStart, sal_uInt16 nE
if ( pAttr )
{
// Remove attribute
-rAttrList.Remove(pAttr);
+rAttrList.Release(pAttr);
}
// check whether 'the same' attribute exist at this place.
@@ -2137,6 +2137,13 @@ void CharAttribList::Remove(size_t nPos)
aAttribs.erase(aAttribs.begin()+nPos);
}
+void CharAttribList::Release(const EditCharAttrib* p)
+{
+AttribsType::iterator it = std::find_if(aAttribs.begin(), aAttribs.end(),
FindByAddress(p));
+if (it != aAttribs.end())
+aAttribs.release(it).release();
+}
+
void CharAttribList::SetHasEmptyAttribs(bool b)
{
bHasEmptyAttribs = b;
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index bf00c76..609e2bd 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -253,6 +253,7 @@ public:
void Remove(const EditCharAttrib* p);
void Remove(size_t nPos);
+void Release(const EditCharAttrib* p);
#if OSL_DEBUG_LEVEL 2
// Debug:
@@ -315,7 +316,10 @@ public:
ContentNode* operator[](size_t nPos);
void Insert(size_t nPos, ContentNode* p);
+/// deletes
void Remove(size_t nPos);
+/// does not delete
+void Release(size_t nPos);
size_t Count() const;
void Clear();
};
diff --git a/editeng/source/editeng/editdoc2.cxx
b/editeng/source/editeng/editdoc2.cxx
index b22c10b..fc65c9c 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -419,6 +419,14 @@ void ContentList::Remove(size_t nPos)
maContents.erase(maContents.begin() + nPos);
}
+void ContentList::Release(size_t nPos)
+{
+if (nPos = maContents.size())
+return;
+
+maContents.release(maContents.begin() + nPos).release();
+}
+
size_t ContentList::Count() const
{
return maContents.size();
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index a4654f0..9bab5db 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2192,7 +2192,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
{
// always aOldPositions.Min(), since Remove().
ParaPortion* pTmpPortion =
GetParaPortions().Release(aOldPositions.Min());
-aEditDoc.Remove( (sal_uInt16)aOldPositions.Min() );
+aEditDoc.Release( (sal_uInt16)aOldPositions.Min() );
aTmpPortionList.Append(pTmpPortion);
}
@@ -2237,7 +2237,8 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
if ( pRecalc4 )
CalcHeight( pRecalc4 );
-aTmpPortionList.Reset();
+while( aTmpPortionList.Count() 0 )
+aTmpPortionList.Release( aTmpPortionList.Count() - 1 );
#if OSL_DEBUG_LEVEL 2
GetParaPortions().DbgCheck(aEditDoc);
@@ -2484,7 +2485,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
// The node is managed by the undo and possibly destroyed!
-aEditDoc.Remove( nPara );
+aEditDoc.Release( nPara );
GetParaPortions().Remove( nPara );
if ( IsCallParaInsertedOrDeleted() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit b512c3ca29735f15383c5f6215348fccfaddd40e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 29 02:00:02 2012 -0400
No need to delete ParaPortion outside of the container any more.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 04cebce..e7d2bbc 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2477,18 +2477,15 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16
nPara )
{
ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
ContentNode* pNextNode = aEditDoc.SaveGetObject( nPara+1 );
-ParaPortion* pPortion = GetParaPortions().SaveGetObject( nPara );
OSL_ENSURE( pNode, Blind Node in ImpRemoveParagraph );
-OSL_ENSURE( pPortion, Blind Portion in ImpRemoveParagraph(2) );
DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pNode, nPara );
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
// The node is managed by the undo and possibly destroyed!
-/* delete */ aEditDoc.Remove( nPara );
+aEditDoc.Remove( nPara );
GetParaPortions().Remove( nPara );
-delete pPortion;
if ( IsCallParaInsertedOrDeleted() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editeng.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a159dfbea39dd3470837e73bf2df4cd2a0f3e806
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 29 11:04:03 2012 +0200
-Werror=sign-compare
...solved by recasting the offending expression.
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 2b246c9..4f9184f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1320,7 +1320,7 @@ EditTextObject* EditEngine::CreateTextObject( sal_uInt16
nPara, sal_uInt16 nPara
{
DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( nPara pImpEditEngine-GetEditDoc().Count(),
CreateTextObject: Startpara out of Range );
-DBG_ASSERT( nPara+nParas-1 pImpEditEngine-GetEditDoc().Count(),
CreateTextObject: Endpara out of Range );
+DBG_ASSERT( nParas = pImpEditEngine-GetEditDoc().Count() - nPara,
CreateTextObject: Endpara out of Range );
ContentNode* pStartNode = pImpEditEngine-GetEditDoc().SafeGetObject(
nPara );
ContentNode* pEndNode = pImpEditEngine-GetEditDoc().SafeGetObject(
nPara+nParas-1 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source filter/source sc/source starmath/source svtools/inc toolkit/source
editeng/source/editeng/editdoc.hxx |1 - editeng/source/misc/svxacorr.cxx|1 - filter/source/xsltdialog/xmlfileview.hxx|1 - sc/source/filter/html/htmlpars.cxx |1 - starmath/source/math_pch.cxx|1 - svtools/inc/svtools/treelist.hxx|2 +- toolkit/source/controls/unocontrol.cxx |1 - toolkit/source/controls/unocontrolmodel.cxx |1 - 8 files changed, 1 insertion(+), 8 deletions(-) New commits: commit 82f5a3b5df000966d344b26fe36e776bc947c6ef Author: Noel Grandin n...@peralex.com Date: Thu Mar 29 16:49:07 2012 +0200 Remove unnecessary tools/table.hxx #includes diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 59010d6..bf00c76 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -37,7 +37,6 @@ #include svl/itemset.hxx #include svl/style.hxx #include svl/itempool.hxx -#include tools/table.hxx #include vector #include deque diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index ac726c8..651b9eb 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -29,7 +29,6 @@ #include com/sun/star/io/XStream.hpp #include com/sun/star/lang/Locale.hpp #include tools/urlobj.hxx -#include tools/table.hxx #include i18npool/mslangid.hxx #include vcl/svapp.hxx #include sot/storinfo.hxx diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx index 4ff36a4..5623fab 100644 --- a/filter/source/xsltdialog/xmlfileview.hxx +++ b/filter/source/xsltdialog/xmlfileview.hxx @@ -32,7 +32,6 @@ #include svl/lstner.hxx #include vcl/timer.hxx -#include tools/table.hxx #include svtools/xtextedt.hxx #include vcl/timer.hxx #include vcl/wrkwin.hxx diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index aaae381..019d057 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -58,7 +58,6 @@ #include vcl/svapp.hxx #include tools/urlobj.hxx #include tools/tenccvt.hxx -#include tools/table.hxx #include htmlpars.hxx #include global.hxx diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index ee17d65..945025c 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -349,7 +349,6 @@ #include vcl/metric.hxx #include sfx2/inimgr.hxx #include node.hxx -#include tools/table.hxx #include sfx2/docfac.hxx #include svl/ownlist.hxx #include sfx2/objsh.hxx diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index b2a7173..c505e27 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -29,12 +29,12 @@ #ifndef _SVTREELIST_HXX #define _SVTREELIST_HXX +#include limits.h #include svtools/svtdllapi.h #include tools/solar.h #include vector #include boost/ptr_container/ptr_map.hpp -#include tools/table.hxx #include tools/link.hxx #include tools/string.hxx #include tools/debug.hxx diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index b845b59..cec8c40 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -39,7 +39,6 @@ #include rtl/memory.h #include rtl/uuid.h #include osl/mutex.hxx -#include tools/table.hxx #include tools/date.hxx #include tools/debug.hxx #include tools/diagnose_ex.h diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index ac7f3ed..8afc19e 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -43,7 +43,6 @@ #include rtl/memory.h #include rtl/uuid.h #include tools/diagnose_ex.h -#include tools/table.hxx #include tools/date.hxx #include tools/time.hxx #include tools/debug.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 736bf5c26f4f220171d95f52b933669c1ff6b172
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Mar 28 14:00:06 2012 -0400
Keep tinderbox happy.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index a1b4575..4070002 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -349,21 +349,21 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE,
sal_Bool bInfoBox )
sal_uInt16 z;
for ( z = 0; z pPPortion-GetNode()-GetCharAttribs().Count(); z++ )
{
-EditCharAttrib* pAttr =
pPPortion-GetNode()-GetCharAttribs().GetAttribs().GetObject( z );
+const EditCharAttrib rAttr =
pPPortion-GetNode()-GetCharAttribs().GetAttribs()[z];
rtl::OStringBuffer aCharAttribs;
aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(\nA));
aCharAttribs.append(static_castsal_Int32(nPortion));
aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(: ));
-
aCharAttribs.append(static_castsal_Int32(pAttr-GetItem()-Which()));
+
aCharAttribs.append(static_castsal_Int32(rAttr.GetItem()-Which()));
aCharAttribs.append('\t');
-aCharAttribs.append(static_castsal_Int32(pAttr-GetStart()));
+aCharAttribs.append(static_castsal_Int32(rAttr.GetStart()));
aCharAttribs.append('\t');
-aCharAttribs.append(static_castsal_Int32(pAttr-GetEnd()));
-if ( pAttr-IsEmpty() )
+aCharAttribs.append(static_castsal_Int32(rAttr.GetEnd()));
+if ( rAttr.IsEmpty() )
bZeroAttr = sal_True;
fprintf(fp, %s = , aCharAttribs.getStr());
-rtl::OString aDebStr = DbgOutItem( rPool, *pAttr-GetItem() );
+rtl::OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() );
fprintf( fp, %s, aDebStr.getStr() );
}
if ( bZeroAttr )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sc/source
editeng/source/items/flditem.cxx | 16
sc/source/ui/app/scdll.cxx |6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit df827af160fa255c56b9aaef644a2d9c4680977d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 27 01:34:35 2012 -0400
Let's not use a macro for this...
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index a182a36..58f6ab1 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -948,14 +948,14 @@ SvClassManager SvxFieldItem::GetClassManager()
if ( !pClassMgr )
{
pClassMgr = new SvClassManager;
-pClassMgr-SV_CLASS_REGISTER( SvxFieldData );
-pClassMgr-SV_CLASS_REGISTER( SvxURLField );
-pClassMgr-SV_CLASS_REGISTER( SvxDateField );
-pClassMgr-SV_CLASS_REGISTER( SvxPageField );
-pClassMgr-SV_CLASS_REGISTER( SvxTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtFileField );
-pClassMgr-SV_CLASS_REGISTER( SvxAuthorField );
+pClassMgr-Register(SvxFieldData::StaticClassId(),
SvxFieldData::CreateInstance);
+pClassMgr-Register(SvxURLField::StaticClassId(),
SvxURLField::CreateInstance);
+pClassMgr-Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
+pClassMgr-Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
+pClassMgr-Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
+pClassMgr-Register(SvxExtTimeField::StaticClassId(),
SvxExtTimeField::CreateInstance);
+pClassMgr-Register(SvxExtFileField::StaticClassId(),
SvxExtFileField::CreateInstance);
+pClassMgr-Register(SvxAuthorField::StaticClassId(),
SvxAuthorField::CreateInstance);
}
return *pClassMgr;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 25712d4..2d9af16 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -295,9 +295,9 @@ void ScDLL::Init()
// Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
SvClassManager rClassManager = SvxFieldItem::GetClassManager();
-rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-rClassManager.SV_CLASS_REGISTER( SvxFileField );
-rClassManager.SV_CLASS_REGISTER( SvxTableField );
+rClassManager.Register(SvxPagesField::StaticClassId(),
SvxPagesField::CreateInstance);
+rClassManager.Register(SvxFileField::StaticClassId(),
SvxFileField::CreateInstance);
+rClassManager.Register(SvxTableField::StaticClassId(),
SvxTableField::CreateInstance);
SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/frmitems.cxx | 30 ++
1 file changed, 14 insertions(+), 16 deletions(-)
New commits:
commit ffc3c27130faec6c5337943975fa6ebf7623de36
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 13 12:58:07 2012 +
Conditional jump or move depends on uninitialised value
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index f38ba5d..c2dbce8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -792,28 +792,26 @@ bool SvxLRSpaceItem::HasMetrics() const
// class SvxULSpaceItem --
-SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId ) :
-
-SfxPoolItem( nId ),
-
-nUpper( 0 ),
-nLower( 0 ),
-nPropUpper( 100 ),
-nPropLower( 100 )
+SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
+: SfxPoolItem(nId)
+, nUpper(0)
+, nLower(0)
+, bContext(false)
+, nPropUpper(100)
+, nPropLower(100)
{
}
// ---
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
-const sal_uInt16 nId ) :
-
-SfxPoolItem( nId ),
-
-nUpper( nUp ),
-nLower( nLow ),
-nPropUpper( 100 ),
-nPropLower( 100 )
+const sal_uInt16 nId )
+: SfxPoolItem(nId)
+, nUpper(nUp)
+, nLower(nLow)
+, bContext(false)
+, nPropUpper(100)
+, nPropLower(100)
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit.hxx |6 ++--
editeng/source/editeng/impedit3.cxx | 50 ++--
editeng/source/editeng/impedit4.cxx |4 +-
3 files changed, 25 insertions(+), 35 deletions(-)
New commits:
commit f2d0fcc26be481c2f872056fb3b8402169d124d8
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Sat Mar 10 22:16:16 2012 +0100
Replace VARARR_SORT with std
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 2076d29..5196703 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -905,7 +905,7 @@ public:
LanguageTypeGetDefaultLanguage() const { return eDefLanguage; }
-LanguageTypeGetLanguage( const EditSelection rSelection ) const;
+LanguageTypeGetLanguage( const EditSelection rSelection ) const;
LanguageTypeGetLanguage( const EditPaM rPaM, sal_uInt16* pEndPos
= NULL ) const;
::com::sun::star::lang::Locale GetLocale( const EditPaM rPaM ) const;
@@ -945,12 +945,12 @@ public:
//adds one or more portions of text to the SpellPortions depending on
language changes
voidAddPortionIterated(
EditView rEditView,
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill);
//adds one portion to the SpellPortions
voidAddPortion(
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill,
bool bIsField );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index d37d8d9..a7919a2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -68,6 +68,7 @@
#include editeng/unolingu.hxx
+#include set
#include math.h
#include vcl/svapp.hxx
#include vcl/metric.hxx
@@ -86,9 +87,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16 )
-SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 );
-
#define CH_HYPH '-'
#define RESDIFF 10
@@ -2252,14 +2250,14 @@ sal_uInt16 ImpEditEngine::SplitTextPortion(
ParaPortion* pPortion, sal_uInt16 nP
return nSplitPortion;
}
-void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart /* , sal_Bool bCreateBlockPortions */ )
+void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart )
{
sal_uInt16 nStartPos = rStart;
ContentNode* pNode = pParaPortion-GetNode();
DBG_ASSERT( pNode-Len(), CreateTextPortions should not be used for empty
paragraphs! );
-SortedPositions aPositions;
-aPositions.Insert( (sal_uInt32) 0 );
+::std::set sal_uInt32 aPositions;
+aPositions.insert( 0 );
sal_uInt16 nAttr = 0;
EditCharAttrib* pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(),
nAttr );
@@ -2267,23 +2265,23 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
// Insert Start and End into the Array...
// The Insert method does not allow for duplicate values
-aPositions.Insert( pAttrib-GetStart() );
-aPositions.Insert( pAttrib-GetEnd() );
+aPositions.insert( pAttrib-GetStart() );
+aPositions.insert( pAttrib-GetEnd() );
nAttr++;
pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(), nAttr );
}
-aPositions.Insert( pNode-Len() );
+aPositions.insert( pNode-Len() );
if ( pParaPortion-aScriptInfos.empty() )
((ImpEditEngine*)this)-InitScriptTypes( GetParaPortions().GetPos(
pParaPortion ) );
const ScriptTypePosInfos rTypes = pParaPortion-aScriptInfos;
for ( size_t nT = 0; nT rTypes.size(); nT++ )
-aPositions.Insert( rTypes[nT].nStartPos );
+aPositions.insert( rTypes[nT].nStartPos );
const WritingDirectionInfos rWritingDirections =
pParaPortion-aWritingDirectionInfos;
for ( size_t nD = 0; nD rWritingDirections.size(); nD++ )
-aPositions.Insert( rWritingDirections[nD].nStartPos );
+aPositions.insert( rWritingDirections[nD].nStartPos );
if ( mpIMEInfos mpIMEInfos-nLen mpIMEInfos-pAttribs (
mpIMEInfos-aPos.GetNode() == pNode ) )
{
@@ -2292,11 +2290,11 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
if ( mpIMEInfos-pAttribs[n] != nLastAttr )
{
-aPositions.Insert( mpIMEInfos-aPos.GetIndex() + n );
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx | 26 --
editeng/source/editeng/impedit.hxx |5 ++---
editeng/source/editeng/impedit4.cxx | 24
3 files changed, 14 insertions(+), 41 deletions(-)
New commits:
commit a0cd57b926830e8798a5019b30776e94dd97c8a1
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 1 10:22:36 2012 +0200
Remove SvxFontTable and use std::vector instead
In removing tools/table.hxx usage, remove SvxFontTable and
convert to std::vectorSvxFontItem* because it was only
being used as a temporary list, not a map.
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 50f96a2..98268d9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2161,32 +2161,6 @@ bool CharAttribList::DbgCheckAttribs() const
}
#endif
-SvxFontTable::SvxFontTable()
-{
-}
-
-SvxFontTable::~SvxFontTable()
-{
-SvxFontItem* pItem = First();
-while( pItem )
-{
-delete pItem;
-pItem = Next();
-}
-}
-
-sal_uLong SvxFontTable::GetId( const SvxFontItem rFontItem )
-{
-SvxFontItem* pItem = First();
-while ( pItem )
-{
-if ( *pItem == rFontItem )
-return GetCurKey();
-pItem = Next();
-}
-DBG_WARNING( Font not found: GetId() );
-return 0;
-}
SvxColorList::SvxColorList()
{
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 1c008fb..d02a959 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -80,7 +80,6 @@ DBG_NAMEEX( EditEngine )
class EditView;
class EditEngine;
-class SvxFontTable;
class SvxColorList;
class SvxSearchItem;
@@ -640,9 +639,9 @@ private:
sal_uInt32 WriteBin( SvStream rOutput, EditSelection aSel,
sal_Bool bStoreUnicode = sal_False ) const;
voidWriteItemAsRTF( const SfxPoolItem rItem, SvStream
rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_BoolWriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_Int32 LogicToTwips( sal_Int32 n );
inline shortGetXValue( short nXValue ) const;
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index f76b0ca..07d8074 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -277,7 +277,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream rOutput,
EditSelection aSel )
}
sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList )
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList )
{
const SfxPoolItem* pAttrItem = rLst.First();
while ( pAttrItem )
@@ -358,11 +358,11 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
// Generate and write out Font table ...
-SvxFontTable aFontTable;
+std::vectorSvxFontItem* aFontTable;
// default font must be up front, so DEF font in RTF
-aFontTable.Insert( 0, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
-aFontTable.Insert( 1, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
-aFontTable.Insert( 2, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
for ( sal_uInt16 nScriptType = 0; nScriptType 3; nScriptType++ )
{
sal_uInt16 nWhich = EE_CHAR_FONTINFO;
@@ -376,14 +376,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
while ( pFontItem )
{
bool bAlreadyExist = false;
-sal_uLong nTestMax = nScriptType ? aFontTable.Count() : 1;
+sal_uLong nTestMax = nScriptType ? aFontTable.size() : 1;
for ( sal_uLong nTest = 0; !bAlreadyExist ( nTest nTestMax );
nTest++ )
{
-bAlreadyExist = *aFontTable.Get( nTest ) == *pFontItem;
+
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/edtspell.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 1c85118414d91bc0b881f03ad7fac20454ec43a0
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Feb 5 22:02:12 2012 +0400
fix debug build
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index eda0d61..a2340aa 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -505,7 +505,6 @@ bool WrongList::operator==(const WrongList rCompare) const
return true;
}
-#ifdef DBG_UTIL
sal_Bool WrongList::DbgIsBuggy() const
{
// Check if the ranges overlap.
@@ -524,7 +523,6 @@ sal_Bool WrongList::DbgIsBuggy() const
}
return bError;
}
-#endif
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/borderline.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 971f826a96f0938bfcfd8dfe26edd50d8e031bb4
Author: Eike Rathke er...@redhat.com
Date: Thu Feb 2 19:11:37 2012 +0100
resolved fdo#42784 BorderLine with only InnerWidth set does not work
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 8d073c6..b617ff4 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -298,6 +298,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
else
{
SetStyle( nStyle );
+if (nOut == 0 nIn 0)
+{
+// If only inner width is given swap inner and outer widths for
+// single line styles, otherwise GuessWidth() marks this as invalid
+// and returns a 0 width.
+switch (nStyle)
+{
+case SOLID:
+case DOTTED:
+case DASHED:
+::std::swap( nOut, nIn);
+break;
+default:
+; // nothing
+}
+}
m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/accessibility/AccessibleStaticTextBase.cxx |2 +-
sw/source/core/doc/ftnidx.cxx | 10 ++
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 428c9d516d3408460f1b7f8ce2c753b9a829de87
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 19:36:28 2012 +0100
Some cppcheck cleaning
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9e234d9..734dc1b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -344,7 +344,7 @@ namespace accessibility
{
// Keep 'invalid' values at the TextSegment
if( aTextSegment.SegmentStart != -1
-aTextSegment.SegmentStart != -1 )
+aTextSegment.SegmentEnd != -1 )
{
// #112814# Correct TextSegment by paragraph offset
sal_Int32 nOffset(0);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 3ccd856..52f9873 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -192,10 +192,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex rStt )
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
@@ -281,10 +278,7 @@ void SwFtnIdxs::UpdateAllFtn()
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source oox/source sd/source
editeng/source/editeng/editdbg.cxx |2 +-
oox/source/helper/propertymap.cxx| 30 +++---
sd/source/filter/eppt/pptx-epptooxml.cxx | 12 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit fcc8db1d2be9a25f79cbcc14043b495d240bb8bf
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Jan 14 11:30:26 2012 +0100
fix for gcc 4.7: unable to find string literal operator
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 9389001..fc9c562 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp,
\n\n
);
fprintf( fp, \n== EditEngine Views
== );
fprintf( fp,
\n
);
-fprintf( fp, \nControl: %SAL_PRIxUINT32, pEE-GetControlWord() );
+fprintf( fp, \nControl: % SAL_PRIxUINT32, pEE-GetControlWord() );
fprintf( fp, \nRefMapMode: %i,
pEE-pImpEditEngine-pRefDev-GetMapMode().GetMapUnit() );
fprintf( fp, \nPaperSize: %li x %li, pEE-GetPaperSize().Width(),
pEE-GetPaperSize().Height() );
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index b4094eb..af0d374 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -355,9 +355,9 @@ static void lclDumpAnyValue( Any value)
} else if( value = aMatrix ) {
fprintf (stderr,Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n,
aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3,
aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3,
aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3);
} else if( value = intValue )
-fprintf (stderr,%SAL_PRIdINT32(hex:
%SAL_PRIxUINT32)\n, intValue, intValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: %
SAL_PRIxUINT32 )\n, intValue, intValue);
else if( value = uintValue )
-fprintf (stderr,%SAL_PRIdINT32(hex:
%SAL_PRIxUINT32)\n, uintValue, uintValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: %
SAL_PRIxUINT32 )\n, uintValue, uintValue);
else if( value = int16Value )
fprintf (stderr,%d(hex: %x)\n, int16Value,
int16Value);
else if( value = uint16Value )
@@ -502,7 +502,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return Any (str);
} else if( value = strArray ) {
printLevel (level);
-fprintf (stderr,Sequence OUString aStringSequence
(%SAL_PRIdINT32);\n, strArray.getLength());
+fprintf (stderr,Sequence OUString aStringSequence (%
SAL_PRIdINT32 );\n, strArray.getLength());
for( int i=0; istrArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr,aStringSequence[%d] = CREATE_OUSTRING
(\%s\);\n, i, USS( strArray[i] ) );
@@ -510,7 +510,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return aStringSequence;
} else if( value = propArray ) {
printLevel (level);
-fprintf (stderr,Sequence PropertyValue aPropSequence
(%SAL_PRIdINT32);\n, propArray.getLength());
+fprintf (stderr,Sequence PropertyValue aPropSequence (%
SAL_PRIdINT32 );\n, propArray.getLength());
for( int i=0; ipropArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr, {\n);
@@ -525,7 +525,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return aPropSequence;
} else if( value = propArrayArray ) {
printLevel (level);
-fprintf (stderr,Sequence Sequence PropertyValue
aPropSequenceSequence (%SAL_PRIdINT32);\n, propArrayArray.getLength());
+fprintf (stderr,Sequence Sequence PropertyValue
aPropSequenceSequence (% SAL_PRIdINT32 );\n, propArrayArray.getLength());
for( int i=0; ipropArrayArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr, {\n);
@@ -544,7 +544,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
}
} else if( value = adjArray ) {
printLevel (level);
-fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue
aAdjSequence (%SAL_PRIdINT32);\n, adjArray.getLength());
+fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue
aAdjSequence (% SAL_PRIdINT32 );\n, adjArray.getLength());
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0204bbffbc273782ca3148c7ba6768af4f5a77f9
Author: August Sodora aug...@gmail.com
Date: Wed Jan 11 20:49:52 2012 -0500
Remove an unused SvStringsDtor
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b7df997..169c403 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2155,7 +2155,6 @@ SvxAutocorrWordList*
SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
else
pAutocorr_List = new SvxAutocorrWordList( 16, 16 );
-SvStringsDtor aRemoveArr;
try
{
uno::Reference embed::XStorage xStg =
comphelper::OStorageHelper::GetStorageFromURL( sShareAutoCorrFile,
embed::ElementModes::READ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/svxitems.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b95be347d45c90febdeca85d22b65c03fba283bc
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:08:09 2012 +0100
make measurement units localizable
diff --git a/editeng/source/items/svxitems.src
b/editeng/source/items/svxitems.src
index 222fc2c..6049ad6 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -598,27 +598,27 @@ String RID_OUTSET
};
String RID_SVXITEMS_METRIC_MM
{
-Text = mm ;
+Text [ en-US ] = mm ;
};
String RID_SVXITEMS_METRIC_CM
{
-Text = cm ;
+Text [ en-US ] = cm ;
};
String RID_SVXITEMS_METRIC_INCH
{
-Text = inch ;
+Text [ en-US ] = inch ;
};
String RID_SVXITEMS_METRIC_POINT
{
-Text = pt ;
+Text [ en-US ] = pt ;
};
String RID_SVXITEMS_METRIC_TWIP
{
-Text = twip ;
+Text [ en-US ] = twip ;
};
String RID_SVXITEMS_METRIC_PIXEL
{
-Text = pixel ;
+Text [ en-US ] = pixel ;
};
// GetValueText von BoolItems
String RID_SVXITEMS_SHADOWED_TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9f68b6d2356ef81560b5449670b81a1156a5da6
Author: August Sodora aug...@gmail.com
Date: Fri Dec 23 19:44:48 2011 -0500
Fix the build so that this is recognized as an initializer list
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c2d937a..df191c0 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1644,7 +1644,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType
eLang, sal_Bool bNewFi
}
else if( !bNewFile )
{
-pLastFileTable[eLang] = { std::make_pair(eLang, nAktTime.GetTime()) };
+pLastFileTable[eLang] = { std::make_pair(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/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 93d3f6258f8f061dc53b5e6003de65479c2290ba
Author: David Tardon dtar...@redhat.com
Date: Sat Dec 24 06:29:30 2011 +0100
make the line work as intended again
At least I suppose memory corruption is not intended behavior .-)
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index df191c0..f28df9d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1644,7 +1644,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType
eLang, sal_Bool bNewFi
}
else if( !bNewFile )
{
-pLastFileTable[eLang] = { std::make_pair(eLang, nAktTime.GetTime()), };
+(*pLastFileTable)[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/source oox/inc oox/source svtools/inc svtools/source writerfilter/source
editeng/source/rtf/rtfgrf.cxx |9 ---
oox/inc/oox/helper/graphichelper.hxx |8 ++-
oox/source/helper/graphichelper.cxx| 65 -
svtools/inc/svtools/filter.hxx |6 +-
svtools/inc/svtools/wmf.hxx| 48 ++
svtools/source/filter/filter.cxx |8 +--
svtools/source/filter/wmf/winmtf.hxx | 14 +++--
svtools/source/filter/wmf/winwmf.cxx | 62 ---
svtools/source/filter/wmf/wmf.cxx |4 -
svtools/source/graphic/provider.cxx| 42 +++-
writerfilter/source/rtftok/rtfcontrolwords.cxx |2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
13 files changed, 187 insertions(+), 101 deletions(-)
New commits:
commit f4f4a899f0d5520a497bbd07ccfef9086c54ca1c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Nov 24 15:05:25 2011 +0100
RTF import: partly fixed the WMF images scaling.
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 4ff9f35..2906caa 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -495,15 +495,8 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic rGrf,
SvxRTFPictureType rPicType )
}
String sTmpStr;
-WMF_APMFILEHEADER aAPMHeader;
-aAPMHeader.left=0;
-aAPMHeader.top=0;
-aAPMHeader.right=rPicType.nWidth;
-aAPMHeader.bottom=rPicType.nHeight;
-
-WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right0
aAPMHeader.bottom0?aAPMHeader:NULL);
pTmpFile-Seek( STREAM_SEEK_TO_BEGIN );
-bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter, NULL, 0, pAPMHeader );
+bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter );
}
}
diff --git a/oox/inc/oox/helper/graphichelper.hxx
b/oox/inc/oox/helper/graphichelper.hxx
index f144cd1..d3507fa 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -37,6 +37,8 @@
#include oox/helper/binarystreambase.hxx
#include oox/helper/storagebase.hxx
+struct WMF_EXTERNALHEADER;
+
namespace com { namespace sun { namespace star {
namespace awt { struct Point; }
namespace awt { struct Size; }
@@ -115,7 +117,8 @@ public:
/** Imports a graphic from the passed input stream. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
importGraphic(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Imports a graphic from the passed binary memory block. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
@@ -133,7 +136,8 @@ public:
/** Creates a persistent graphic object from the passed input stream.
@return The URL of the created and internally cached graphic object.
*/
::rtl::OUString importGraphicObject(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Creates a persistent graphic object from the passed binary memory
block.
@return The URL of the created and internally cached graphic object.
*/
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index 941cc80..fd3046e 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/graphic/XGraphicProvider.hpp
#include com/sun/star/util/MeasureUnit.hpp
#include comphelper/seqstream.hxx
+#include svtools/wmf.hxx
#include oox/helper/containerhelper.hxx
#include oox/helper/propertyset.hxx
#include oox/token/tokens.hxx
@@ -47,7 +48,8 @@ namespace oox {
//
-using namespace ::com::sun::star::awt;
+
+using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::graphic;
@@ -130,7 +132,7 @@ GraphicHelper::GraphicHelper( const Reference
XComponentContext rxContext, c
maDeviceInfo.PixelPerMeterX = maDeviceInfo.PixelPerMeterY = 3500.0; //
some default just in case
if( xFrame.is() ) try
{
-Reference XDevice xDevice( xFrame-getContainerWindow(),
UNO_QUERY_THROW );
+
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/uno/unotext.cxx| 34 --
sw/source/filter/xml/xmltexti.cxx |2 +-
2 files changed, 21 insertions(+), 15 deletions(-)
New commits:
commit aa0b7b033098bfc1bf3f06cd112691abc862bd20
Author: Michael Meeks michael.me...@suse.com
Date: Sat Nov 12 11:15:19 2011 +
avoid crasher from unusual odt document fdo#42785
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index ac241d2..5933da3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -183,6 +183,13 @@ void CheckSelection( struct ESelection rSel,
SvxTextForwarder* pForwarder ) thr
}
}
+void CheckSelection( struct ESelection rSel, SvxEditSource *pEdit ) throw()
+{
+if (!pEdit)
+return;
+CheckSelection( rSel, pEdit-GetTextForwarder() );
+}
+
//
// class SvxUnoTextRangeBase
//
@@ -275,8 +282,7 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection
rSelection ) throw()
SolarMutexGuard aGuard;
maSelection = rSelection;
-if (mpEditSource != NULL)
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
}
// Interface XTextRange ( XText )
@@ -291,7 +297,6 @@ uno::Reference text::XTextRange SAL_CALL
SvxUnoTextRangeBase::getStart(void)
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
{
-
CheckSelection( maSelection, pForwarder );
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( getText() );
@@ -406,7 +411,6 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const
OUString PropertyNa
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
{
-
CheckSelection( maSelection, pForwarder );
const SfxItemPropertySimpleEntry* pMap =
mpPropSet-getPropertyMapEntry(PropertyName );
@@ -1308,7 +1312,7 @@ uno::Sequence uno::Any SAL_CALL
SvxUnoTextRangeBase::getPropertyDefaults( con
// internal
void SvxUnoTextRangeBase::CollapseToStart(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
maSelection.nEndPara = maSelection.nStartPara;
maSelection.nEndPos = maSelection.nStartPos;
@@ -1316,7 +1320,7 @@ void SvxUnoTextRangeBase::CollapseToStart(void) throw()
void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
maSelection.nStartPara = maSelection.nEndPara;
maSelection.nStartPos = maSelection.nEndPos;
@@ -1324,7 +1328,7 @@ void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
return ( maSelection.nStartPara == maSelection.nEndPara
maSelection.nStartPos == maSelection.nEndPos );
@@ -1332,7 +1336,7 @@ sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
// #75098# use end position, as in Writer (start is anchor, end is cursor)
sal_uInt16 nNewPos = maSelection.nEndPos;
@@ -1375,7 +1379,6 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount,
sal_Bool Expand) throw(
{
CheckSelection( maSelection, pForwarder );
-
sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Overflow???
sal_uInt16 nNewPar = maSelection.nEndPara;
@@ -1419,7 +1422,7 @@ void SvxUnoTextRangeBase::GotoStart(sal_Bool Expand)
throw()
void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
@@ -1670,8 +1673,11 @@ void SAL_CALL SvxUnoTextBase::insertString( const
uno::Reference text::XTextRan
return;
ESelection aSelection;
-::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
-SetSelection( aSelection );
+if (GetEditSource())
+{
+::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
+SetSelection( aSelection );
+}
SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange );
if(pRange)
@@ -1771,10 +1777,10 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter(
const uno::Reference text
return;
}
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 3f9df85defed04730fda2c862810b505579fb958 Author: Christina Rossmanith chrrossman...@web.de Date: Wed Nov 9 16:59:47 2011 + _SVSTDARR_sal_uIt16S is a typo and doesn't do anything diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 83695cf..bdf1bbd 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -36,9 +36,6 @@ #include vcl/metaact.hxx #include vcl/gdimtf.hxx -#define _SVSTDARR_sal_uIt16S -#include svl/svstdarr.hxx - #include vcl/wrkwin.hxx #include editeng/adjitem.hxx #include editeng/tstpitem.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source formula/source sc/source sd/source svtools/source sw/source vcl/aqua vcl/inc vcl/unx vcl/win
editeng/source/editeng/editeng.cxx |2 +-
editeng/source/editeng/impedit3.cxx |2 +-
formula/source/ui/dlg/formula.cxx|4 ++--
sc/source/core/tool/chartlis.cxx |2 +-
sc/source/ui/app/scmod.cxx |2 +-
sd/source/ui/tools/IdleDetection.cxx |2 +-
svtools/source/control/inettbc.cxx |2 +-
svtools/source/edit/textview.cxx |2 +-
sw/source/core/layout/paintfrm.cxx |2 +-
sw/source/core/view/viewsh.cxx |2 +-
sw/source/ui/docvw/edtwin.cxx|2 +-
vcl/aqua/source/app/salinst.cxx |4 ++--
vcl/inc/vcl/apptypes.hxx |6 +++---
vcl/unx/generic/app/salinst.cxx |4 ++--
vcl/win/source/app/salinst.cxx |2 +-
15 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit b0224f8050373cbdde58c3dee1bbda71976b50b6
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Oct 21 16:54:35 2011 -0200
Fix for bug fdo#41997, cleanup vcl enumeration
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 5d745c0..573b30b 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1195,7 +1195,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent
rKeyEvent, EditView* pEditVie
DBG_ASSERT( !bReadOnly, ReadOnly but modified??? );
// Idle-Formatter only when AnyInput.
if ( bAllowIdle pImpEditEngine-GetStatus().UseIdleFormatter()
- Application::AnyInput( INPUT_KEYBOARD) )
+ Application::AnyInput( VCL_INPUT_KEYBOARD) )
pImpEditEngine-IdleFormatAndUpdate( pEditView );
else
pImpEditEngine-FormatAndUpdate( pEditView );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index b4efe14..8f059a3 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -327,7 +327,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG )
{
-if ( !Application::AnyInput( INPUT_KEYBOARD ) GetUpdateMode()
IsFormatted() )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) GetUpdateMode()
IsFormatted() )
DoOnlineSpelling();
else
aOnlineSpellTimer.Start();
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 97ef663..3b7c2ec 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -592,7 +592,7 @@ sal_Bool FormulaDlg_Impl::CalcValue( const String rStrExp,
String rStrResult )
{
// Only calculate the value when there isn't any more keyboard input:
-if ( !Application::AnyInput( INPUT_KEYBOARD ) )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
bResult = m_pHelper-calculateValue(rStrExp,rStrResult);
}
@@ -630,7 +630,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const String rStrExp)
{
// Only calculate the value when there isn't any more keyboard input:
-if ( !Application::AnyInput( INPUT_KEYBOARD ) )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
pStructPage-ClearStruct();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 8c52fe4..6f9129d 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -567,7 +567,7 @@ void ScChartListenerCollection::StartTimer()
IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG )
{
-if ( Application::AnyInput( INPUT_KEYBOARD ) )
+if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
aTimer.Start();
return 0;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 7932fca..b4284e7 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1877,7 +1877,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
{
-if ( Application::AnyInput( INPUT_KEYBOARD ) )
+if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
aSpellTimer.Start();
return 0; // dann spaeter wieder...
diff --git a/sd/source/ui/tools/IdleDetection.cxx
b/sd/source/ui/tools/IdleDetection.cxx
index 4ba6163..e0fba1a 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -59,7 +59,7 @@ sal_Int32 IdleDetection::GetIdleState (const ::Window*
pWindow)
sal_Int32 IdleDetection::CheckInputPending (void)
{
-if (GetpApp()-AnyInput(INPUT_MOUSE | INPUT_KEYBOARD | INPUT_PAINT))
+if (GetpApp()-AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD |
INPUT_PAINT))
return IDET_SYSTEM_EVENT_PENDING;
else
return IDET_IDLE;
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 50739d8..097a8ad 100644
--- a/svtools/source/control/inettbc.cxx
+++
[Libreoffice-commits] .: editeng/source
editeng/source/uno/unotext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0a56437e9ce6a228643e2831fe4877e8597cfa6b
Author: Tor Lillqvist t...@iki.fi
Date: Wed Sep 28 23:23:33 2011 +0300
WaE: base class should be explicitly initialized in the copy constructor
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 627f94b..ac241d2 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -214,6 +214,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const
SvxEditSource* pSource, const Sv
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase rRange )
throw()
: SvxUnoTextRangeBase_Base()
+, osl::DebugBaseSvxUnoTextRangeBase()
, mpPropSet(rRange.getPropertySet())
{
SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
