rpms/openoffice.org/devel workspace.javapatch.patch, NONE, 1.1 openoffice.org.spec, 1.397, 1.398 openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch, 1.1, NONE openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Aug 21 11:40:16 UTC 2005
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systembeanshell.patch, 1.2, 1.3 openoffice.org-1.9.122.ooo52974.systemhsqldb.patch, 1.2, 1.3
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch, NONE, 1.1 openoffice.org-1.9.89.rhXXXXXX.noexpandfpicker.desktop.patch, NONE, 1.1 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.14, 1.15 openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch, 1.1, 1.2 openoffice.org.spec, 1.398, 1.399 openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch, 1.1, NONE openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch, 1.1, NONE openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch, 1.1, NONE openoffice.org-1.9.88.rh133741.alwaysgtk.patch, 1.1, NONE openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14433
Modified Files:
openoffice.org.spec
Added Files:
workspace.javapatch.patch
Removed Files:
openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
Log Message:
merge patches by workspace
workspace.javapatch.patch:
inc/shellio.hxx | 3 +++
source/filter/rtf/rtffly.cxx | 16 ++++++++++++----
source/filter/ww8/wrtww8gr.cxx | 4 ++--
source/filter/ww8/ww8graf.cxx | 6 +++---
source/filter/ww8/ww8par.cxx | 27 +++++++++++++++++++++++++++
source/filter/ww8/ww8par2.cxx | 4 ++++
source/filter/ww8/ww8par6.cxx | 10 +++++++++-
source/ui/app/docsh.cxx | 5 ++++-
8 files changed, 64 insertions(+), 11 deletions(-)
--- NEW FILE workspace.javapatch.patch ---
Index: inc/shellio.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/shellio.hxx,v
retrieving revision 1.28
retrieving revision 1.28.334.1
diff -u -p -u -r1.28 -r1.28.334.1
--- openoffice.org.orig/sw/inc/shellio.hxx 25 Jan 2005 13:58:38 -0000 1.28
+++ openoffice.org/sw/inc/shellio.hxx 15 Aug 2005 11:19:05 -0000 1.28.334.1
@@ -338,6 +338,9 @@ public:
virtual USHORT GetSectionList( SfxMedium& rMedium,
SvStrings& rStrings ) const;
+ SotStorageRef getSotStorageRef() { return pStg; };
+ void setSotStorageRef(SotStorageRef pStg) { this->pStg=pStg; };
+
private:
virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0;
Index: source/filter/rtf/rtffly.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/rtf/rtffly.cxx,v
retrieving revision 1.19
retrieving revision 1.19.324.3
diff -u -p -u -r1.19 -r1.19.324.3
--- openoffice.org.orig/sw/source/filter/rtf/rtffly.cxx 31 Jan 2005 13:56:32 -0000 1.19
+++ openoffice.org/sw/source/filter/rtf/rtffly.cxx 17 Aug 2005 13:51:07 -0000 1.19.324.3
@@ -369,7 +369,8 @@ void SwRTFParser::SetFlysInDoc()
SwTxtNode* pSttNd = pFlySave->nSttNd.GetNode().GetTxtNode();
SwTxtNode* pEndNd = pFlySave->nEndNd.GetNode().GetTxtNode();
if( pSttNd && pEndNd &&
- pSttNd->GetIndex() + 1 == pEndNd->GetIndex() )
+ pSttNd->GetIndex() + 1 == pEndNd->GetIndex()
+ && pSttNd->GetTxt().Len()>0 /* #i38227# leave drop caps with no content as fly frames */ )
{
BOOL bJoined;
{
@@ -378,7 +379,6 @@ void SwRTFParser::SetFlysInDoc()
}
if( bJoined )
{
- pEndNd=pSttNd; //#i38227# since pEndNd was deleted and joined
SwFmtDrop aDropCap;
aDropCap.GetLines() = (BYTE)pFlySave->nDropLines;
aDropCap.GetChars() = 1;
@@ -387,9 +387,9 @@ void SwRTFParser::SetFlysInDoc()
pEndNd->RstAttr( aIdx, 1, RES_CHRATR_FONTSIZE );
pEndNd->SwCntntNode::SetAttr( aDropCap );
}
+ delete pFlySave;
+ continue;
}
- delete pFlySave;
- continue;
}
// liegt Ende und Start vom Naechsten im gleichen Node, dann muss
@@ -472,6 +472,14 @@ void SwRTFParser::SetFlysInDoc()
? rNds.MakeEmptySection( aTmpIdx, SwFlyStartNode )
: rNds.MakeTextSection( aTmpIdx, SwFlyStartNode,
(SwTxtFmtColl*)pDoc->GetDfltTxtFmtColl() );
+
+ // patch from cmc for #i52542#
+ if (pSttNd->GetIndex() + 1 == pSttNd->EndOfSectionIndex())
+ {
+ ASSERT(!this, "nothing in this frame, not legal");
+ delete pFlySave;
+ continue;
+ }
// das ist die Verankerungs-Position (fuers Layout!)
pFlySave->nSttNd = aRg.aStart.GetIndex()-1;
Index: source/filter/ww8/wrtww8gr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/wrtww8gr.cxx,v
retrieving revision 1.40
retrieving revision 1.40.352.1
diff -u -p -u -r1.40 -r1.40.352.1
--- openoffice.org.orig/sw/source/filter/ww8/wrtww8gr.cxx 11 Jan 2005 12:35:22 -0000 1.40
+++ openoffice.org/sw/source/filter/ww8/wrtww8gr.cxx 11 Aug 2005 14:39:49 -0000 1.40.352.1
@@ -232,8 +232,8 @@ bool SwWW8Writer::TestOleNeedsGraphic(co
long nX=0,nY=0;
if (!bGraphicNeeded && SwWW8ImplReader::ImportOleWMF(xOleStg,aWMF,nX,nY))
{
- //TODO/LATER: this line looks strange - shouldn't it be true?!
- bGraphicNeeded = false;
+ // bGraphicNeeded set to true is right / fixes #i51670#.
+ bGraphicNeeded = true;
Point aTmpPoint;
Rectangle aRect( aTmpPoint, Size( nX, nY ) );
Graphic aGraph(aWMF);
Index: source/filter/ww8/ww8graf.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8graf.cxx,v
retrieving revision 1.135
retrieving revision 1.135.44.1
diff -u -p -u -r1.135 -r1.135.44.1
--- openoffice.org.orig/sw/source/filter/ww8/ww8graf.cxx 12 Jul 2005 11:42:36 -0000 1.135
+++ openoffice.org/sw/source/filter/ww8/ww8graf.cxx 18 Aug 2005 11:05:39 -0000 1.135.44.1
@@ -2880,8 +2880,8 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
{
pRecord = aData.GetRecord(nTxbx);
if (pRecord && pRecord->pObj && pRecord->aTextId.nTxBxS)
- {
- pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj,
+ { // #i52825# pRetFrmFmt can be NULL
+ pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj,
pRecord, nGrafAnchorCp, pRetFrmFmt);
}
}
@@ -2890,7 +2890,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
}
// --> OD 2005-03-11 #i44344#, #i44681# - positioning attributes already set
- if ( pRetFrmFmt->ISA(SwDrawFrmFmt) )
+ if ( pRetFrmFmt /*#i52825# */ && pRetFrmFmt->ISA(SwDrawFrmFmt) )
{
static_cast<SwDrawFrmFmt*>(pRetFrmFmt)->PosAttrSet();
}
Index: source/filter/ww8/ww8par.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par.cxx,v
retrieving revision 1.155
retrieving revision 1.155.34.1
diff -u -p -u -r1.155 -r1.155.34.1
--- openoffice.org.orig/sw/source/filter/ww8/ww8par.cxx 18 Jul 2005 13:35:55 -0000 1.155
+++ openoffice.org/sw/source/filter/ww8/ww8par.cxx 12 Aug 2005 13:19:57 -0000 1.155.34.1
@@ -2456,6 +2456,33 @@ CharSet SwWW8ImplReader::GetCurrentCharS
eSrcCharSet = pCollA[nCharFmt].GetCharSet();
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
eSrcCharSet = pCollA[nAktColl].GetCharSet();
+ if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
+ { // patch from cmc for #i52786#
+ /*
+ #i22206#/#i52786#
+ The (default) character set used for a run of text is the default
+ character set for the version of Word that last saved the document.
+
+ This is a bit tentative, more might be required if the concept is correct.
+ When later version of word write older 6/95 documents the charset is
+ correctly set in the character runs involved, so its hard to reproduce
+ documents that require this to be sure of the process involved.
+ */
+ const SvxLanguageItem *pLang =
+ (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_LANGUAGE);
+ if (pLang)
+ {
+ switch (pLang->GetLanguage())
+ {
+ case LANGUAGE_CZECH:
+ eSrcCharSet = RTL_TEXTENCODING_MS_1250;
+ break;
+ default:
+ eSrcCharSet = RTL_TEXTENCODING_MS_1252;
+ break;
+ }
+ }
+ }
}
return eSrcCharSet;
}
Index: source/filter/ww8/ww8par2.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par2.cxx,v
retrieving revision 1.113
retrieving revision 1.113.192.1
diff -u -p -u -r1.113 -r1.113.192.1
--- openoffice.org.orig/sw/source/filter/ww8/ww8par2.cxx 30 Mar 2005 10:54:34 -0000 1.113
+++ openoffice.org/sw/source/filter/ww8/ww8par2.cxx 12 Aug 2005 13:19:58 -0000 1.113.192.1
@@ -3871,6 +3871,7 @@ WW8RStyle::WW8RStyle(WW8Fib& rFib, SwWW8
pIo->nColls = cstd;
}
+#if 0 // removed by a patch from cmc for #i52786#
void SetStyleCharSet(SwWW8StyInf &rStyle)
{
/*
@@ -3898,6 +3899,7 @@ void SetStyleCharSet(SwWW8StyInf &rStyle
}
}
}
+#endif
void WW8RStyle::Set1StyleDefaults()
{
@@ -3911,8 +3913,10 @@ void WW8RStyle::Set1StyleDefaults()
if (!bFontChanged) // Style has no Font? set the default,
{
pIo->SetNewFontAttr(ftcStandardChpStsh, true, RES_CHRATR_FONT);
+ /* removed by a patch from cmc for #i52786#
if (pIo->bVer67)
SetStyleCharSet(pIo->pCollA[pIo->nAktColl]);
+ */
}
if( !pIo->bNoAttrImport )
Index: source/filter/ww8/ww8par6.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par6.cxx,v
retrieving revision 1.162
retrieving revision 1.162.58.1
diff -u -p -u -r1.162 -r1.162.58.1
--- openoffice.org.orig/sw/source/filter/ww8/ww8par6.cxx 8 Jul 2005 11:08:22 -0000 1.162
+++ openoffice.org/sw/source/filter/ww8/ww8par6.cxx 12 Aug 2005 13:19:58 -0000 1.162.58.1
@@ -3525,7 +3525,15 @@ bool SwWW8ImplReader::GetFontParams( USH
if( 77 == pF->chs ) // Mac-Font im Mac-Charset oder
reCharSet = eTextCharSet; // auf ANSI-Charset uebersetzt
else
- reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs );
+ { // patch from cmc for #i52786#
+ // #i52786#, for word 67 we'll assume that ANSI is basically invalid,
+ // might be true for (above) mac as well, but would need a mac example
+ // that exercises this to be sure
+ if (bVer67 && pF->chs == 0)
+ reCharSet = RTL_TEXTENCODING_DONTKNOW;
+ else
+ reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs );
+ }
// pF->ff : Family
BYTE b = pF->ff;
Index: source/ui/app/docsh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/docsh.cxx,v
retrieving revision 1.52
retrieving revision 1.52.40.1
diff -u -p -u -r1.52 -r1.52.40.1
--- openoffice.org.orig/sw/source/ui/app/docsh.cxx 14 Jul 2005 11:41:20 -0000 1.52
+++ openoffice.org/sw/source/ui/app/docsh.cxx 15 Aug 2005 11:18:13 -0000 1.52.40.1
@@ -435,7 +435,8 @@ BOOL SwDocShell::ConvertFrom( SfxMedium&
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::ConvertFrom" );
SwReader* pRdr;
- SwRead pRead = StartConvertFrom(rMedium, &pRdr);
+ SwRead pRead = StartConvertFrom(rMedium, &pRdr);
+ SotStorageRef pStg=pRead->getSotStorageRef(); // #i45333# save sot storage ref in case of recursive calls
if (!pRead)
return FALSE;
@@ -491,6 +492,8 @@ BOOL SwDocShell::ConvertFrom( SfxMedium&
// Diese muessen das selbst rufen!
if( bOk && !pDoc->IsInLoadAsynchron() )
StartLoadFinishedTimer();
+
+ pRead->setSotStorageRef(pStg); // #i45333# save sot storage ref in case of recursive calls
return bOk;
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- openoffice.org.spec 21 Aug 2005 09:46:32 -0000 1.397
+++ openoffice.org.spec 21 Aug 2005 11:40:13 -0000 1.398
@@ -167,14 +167,13 @@
Patch49: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
Patch50: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
Patch51: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch52: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
+Patch52: workspace.javapatch.patch
Patch53: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
-Patch54: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
-Patch55: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
-Patch56: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
-Patch57: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch58: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch59: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch54: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch55: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch56: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch57: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch58: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -825,16 +824,15 @@
%if %{cripplemenus}
%patch51 -p1 -b .rh156677.cripplemenus.sysui.patch
%endif
-%patch52 -p1 -b .ooo52542.emptyrtfframes.sw.patch
+%patch52 -p1 -b .workspace.javapatch.patch
%patch53 -p1 -b .oooXXXXX.parallel.solenv.patch
-%patch54 -p1 -b .ooo52786.czech8bitdocimport.patch
%if ! %{internaljavabits}
-%patch55 -p1 -b .ooo52974.systemhsqldb.patch
-%patch56 -p1 -b .ooo52974.systembeanshell.patch
+%patch54 -p1 -b .ooo52974.systemhsqldb.patch
+%patch55 -p1 -b .ooo52974.systembeanshell.patch
%endif
-%patch57 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch58 -p1 -b .ooo53025.exception.package.patch
-%patch59 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch56 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch57 -p1 -b .ooo53025.exception.package.patch
+%patch58 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
%if %{includeexternals}
#start ludicrous workaround
--- openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch DELETED ---
--- openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systembeanshell.patch, 1.2, 1.3 openoffice.org-1.9.122.ooo52974.systemhsqldb.patch, 1.2, 1.3
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch, NONE, 1.1 openoffice.org-1.9.89.rhXXXXXX.noexpandfpicker.desktop.patch, NONE, 1.1 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.14, 1.15 openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch, 1.1, 1.2 openoffice.org.spec, 1.398, 1.399 openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch, 1.1, NONE openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch, 1.1, NONE openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch, 1.1, NONE openoffice.org-1.9.88.rh133741.alwaysgtk.patch, 1.1, NONE openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list