[Libreoffice-commits] .: 6 commits - starmath/uiconfig sw/source sw/uiconfig
René Engelhard
rene at kemper.freedesktop.org
Fri Nov 26 08:51:50 PST 2010
starmath/uiconfig/smath/menubar/menubar.xml | 1 +
sw/source/filter/ww8/wrtw8sty.cxx | 19 ++++++++++++++-----
sw/source/filter/ww8/wrtww8.hxx | 1 +
sw/source/filter/ww8/ww8par.cxx | 9 ++++++++-
sw/source/filter/ww8/ww8scan.cxx | 17 +++++++++++++----
sw/uiconfig/sglobal/menubar/menubar.xml | 1 +
sw/uiconfig/sweb/menubar/menubar.xml | 1 +
sw/uiconfig/swform/menubar/menubar.xml | 1 +
sw/uiconfig/swreport/menubar/menubar.xml | 1 +
sw/uiconfig/swriter/menubar/menubar.xml | 1 +
sw/uiconfig/swxform/menubar/menubar.xml | 1 +
11 files changed, 43 insertions(+), 10 deletions(-)
New commits:
commit 89200918632e30aacd89400f289aca055d1f632b
Merge: 7a57f3b... 580a800...
Author: Rene Engelhard <rene at debian.org>
Date: Fri Nov 26 17:50:30 2010 +0100
Merge branch 'libreoffice-3-3'
commit 580a800a1d059ec54d54298db71765fafb2872a8
Merge: 56a6681... e2bbfbc...
Author: Rene Engelhard <rene at debian.org>
Date: Fri Nov 26 17:42:02 2010 +0100
Merge commit 'ooo/OOO330_m17' into libreoffice-3-3
commit 56a6681b4292702677a9bfc3ee0b8903a4bbc99e
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Nov 26 17:02:07 2010 +0100
Fix n#653526: Some section was added after having written the SEPX
The real problem is probably more on the docx import side, but it can't
hurt to have some guards on the export as well.
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index c82f2b1..38e9d25 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -966,7 +966,8 @@ WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport )
: MSWordSections( rExport ),
aCps( 4, 4 ),
pAttrs( 0 ),
- pTxtPos( 0 )
+ pTxtPos( 0 ),
+ bNoMoreSections( false )
{
// to be in sync with the AppendSection() call in the MSWordSections
// constructor
@@ -1042,9 +1043,12 @@ void MSWordSections::AppendSection( const SwPageDesc* pPd,
void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd,
const SwSectionFmt* pSectionFmt, ULONG nLnNumRestartNo )
{
- aCps.Insert( nStartCp, aCps.Count() );
+ if ( !bNoMoreSections )
+ {
+ aCps.Insert( nStartCp, aCps.Count() );
- AppendSection( pPd, pSectionFmt, nLnNumRestartNo );
+ AppendSection( pPd, pSectionFmt, nLnNumRestartNo );
+ }
}
void MSWordSections::AppendSection( const SwFmtPageDesc& rPD,
@@ -1059,9 +1063,12 @@ void MSWordSections::AppendSection( const SwFmtPageDesc& rPD,
void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwFmtPageDesc& rPD,
const SwNode& rNd, const SwSectionFmt* pSectionFmt, ULONG nLnNumRestartNo )
{
- aCps.Insert(nStartCp, aCps.Count());
+ if ( !bNoMoreSections )
+ {
+ aCps.Insert(nStartCp, aCps.Count());
- AppendSection( rPD, rNd, pSectionFmt, nLnNumRestartNo );
+ AppendSection( rPD, rNd, pSectionFmt, nLnNumRestartNo );
+ }
}
// MSWordSections::SetNum() setzt in jeder Section beim 1. Aufruf den
@@ -1746,6 +1753,8 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
WW8_SepInfo& rSepInfo = aSects[i];
rWrt.SectionProperties( rSepInfo, pA );
+
+ bNoMoreSections = true;
}
rWrt.SetHdFtIndex( nOldIndex ); //0
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a1529b4..081609d 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -228,6 +228,7 @@ class WW8_WrPlcSepx : public MSWordSections
SvULongs aCps; // PTRARR von CPs
WW8_PdAttrDesc* pAttrs;
WW8_WrPlc0* pTxtPos; // Pos der einzelnen Header / Footer
+ bool bNoMoreSections;
// No copy, no assign
WW8_WrPlcSepx( const WW8_WrPlcSepx& );
commit c4cb9ca53070293f6be4b1fffbd551829bf558a3
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Nov 25 22:31:09 2010 +0100
Put show credits entry into all app ui configs
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index d9ae7af..5b01e9b 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -114,6 +114,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 2f6534c..8cd46b6 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -454,6 +454,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index ffae48e..fa417a6 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -383,6 +383,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 729cf02..4e90101 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -450,6 +450,7 @@
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 729cf02..4e90101 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -450,6 +450,7 @@
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 82993b0..58422d9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -458,6 +458,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index df5fe3f..14e758e 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -451,6 +451,7 @@
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
commit e2bbfbc07382adcac481920e1c4cec9fa89557b5
Merge: ea2f3cd... 51e16dd...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Nov 23 16:56:24 2010 +0100
CWS-TOOLING: integrate CWS os145
commit 51e16dd567de56d3a84abeb5f1fc5eee274993d8
Author: os <os at openoffice.org>
Date: Mon Nov 22 16:46:59 2010 +0100
#b7001883# exit if sprm array is invalid
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 04341ab..016a9c8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4919,7 +4919,14 @@ ULONG WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const St
}
SwWW8ImplReader* pRdr = new SwWW8ImplReader(nVersion, pStg, pIn, rDoc,
rBaseURL, bNew);
- nRet = pRdr->LoadDoc( rPam );
+ try
+ {
+ nRet = pRdr->LoadDoc( rPam );
+ }
+ catch( const std::exception& )
+ {
+ nRet = ERR_WW8_NO_WW8_FILE_ERR;
+ }
delete pRdr;
if( refStrm.Is() )
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 36ef485..0784a18 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -892,11 +892,18 @@ void WW8SprmIter::SetSprms(const BYTE* pSprms_, long nLen_)
const BYTE* WW8SprmIter::operator ++( int )
{
- if (nRemLen > 0)
+ if (nRemLen > 0 )
{
- pSprms += nAktSize;
- nRemLen -= nAktSize;
- UpdateMyMembers();
+ if( nRemLen >= nAktSize )
+ {
+ pSprms += nAktSize;
+ nRemLen -= nAktSize;
+ UpdateMyMembers();
+ }
+ else
+ {
+ throw( ::std::exception() );
+ }
}
return pSprms;
}
@@ -3247,6 +3254,8 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
Otherwise our cool fastsave algorithm can be brought to bear on the
problem.
*/
+ if( !pPieceIter )
+ return;
ULONG nOldPos = pPieceIter->GetIdx();
bool bOk = pPieceIter->SeekPos(nOrigCp);
pPieceIter->SetIdx( nOldPos );
More information about the Libreoffice-commits
mailing list