rpms/openoffice.org/F-10 openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, 1.2, 1.3 openoffice.org.spec, 1.1738, 1.1739 workspace.os131.patch, 1.1, 1.2 workspace.pdfextfix02.patch, 1.2, 1.3
Caolan McNamara
caolanm at fedoraproject.org
Tue Sep 1 15:01:52 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985
Modified Files:
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
openoffice.org.spec workspace.os131.patch
workspace.pdfextfix02.patch
Log Message:
Resolves: CVE-2009-0200/CVE-2009-0201
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
dbaccess/source/ui/misc/WCopyTable.cxx | 2 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 2 +-
wizards/com/sun/star/wizards/db/DBMetaData.java | 4 ++--
wizards/com/sun/star/wizards/table/TableWizard.java | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
Index: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 21 Aug 2009 05:08:22 -0000 1.2
+++ openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 1 Sep 2009 15:01:50 -0000 1.3
@@ -58,15 +58,15 @@ diff -ru dbaccess.orig/source/ui/misc/WC
diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
--- dbaccess.orig/source/ui/tabledesign/TableController.cxx 2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TableController.cxx 2009-07-30 14:18:18.000000000 +0100
-@@ -1119,7 +1119,7 @@
+@@ -1100,7 +1100,7 @@
}
if(!bFoundPKey)
{
- if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
-+ if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
++ if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
{
- String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
- String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
+ String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
+ String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
--- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx 2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TEditControl.cxx 2009-07-30 14:18:18.000000000 +0100
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -p -r1.1738 -r1.1739
--- openoffice.org.spec 21 Aug 2009 05:12:22 -0000 1.1738
+++ openoffice.org.spec 1 Sep 2009 15:01:51 -0000 1.1739
@@ -153,6 +153,7 @@ Patch79: openoffice.org-3.1.0.ooo102566.
Patch80: workspace.pdfextfix02.patch
Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
Patch82: workspace.os131.patch
+Patch83: workspace.hb311fixes01.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1429,6 +1430,7 @@ tar xzf %{PATCH21}
%patch80 -p0 -b .workspace.pdfextfix02.patch
%patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
%patch82 -p0 -b .workspace.os131.patch
+%patch83 -p0 -b .workspace.hb311fixes01.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3804,7 +3806,8 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Wed Aug 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.5.UNRELEASED
+* Mon Aug 31 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
+- Resolves: CVE-2009-0200/CVE-2009-0201
- Resolves: rhbz#499474 soffice and .recently-used.xbel
- Resolves: rhbz#504419 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
- Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
workspace.os131.patch:
inc/IDocumentContentOperations.hxx | 2
inc/doc.hxx | 10
inc/unotxdoc.hxx | 32 +--
source/core/doc/doccomp.cxx | 6
source/core/doc/docfmt.cxx | 2
source/core/doc/docglbl.cxx | 2
source/core/doc/docglos.cxx | 2
source/core/doc/doclay.cxx | 4
source/core/doc/docnew.cxx | 385 +++++++++++++++++++++++++++++++++++--
source/core/doc/docnum.cxx | 2
source/core/doc/docredln.cxx | 6
source/core/doc/tblcpy.cxx | 2
source/core/doc/tblrwcl.cxx | 2
source/core/docnode/ndcopy.cxx | 73 +++++--
source/core/docnode/section.cxx | 4
source/core/edit/eddel.cxx | 2
source/core/edit/edglss.cxx | 6
source/core/frmedt/fecopy.cxx | 4
source/core/txtnode/atrftn.cxx | 2
source/core/undo/untblk.cxx | 2
source/filter/ww8/ww8glsy.cxx | 2
source/filter/xml/xmltbli.cxx | 2
source/ui/dbui/dbmgr.cxx | 53 ++---
source/ui/uno/unoatxt.cxx | 4
source/ui/uno/unotxdoc.cxx | 30 +-
25 files changed, 532 insertions(+), 109 deletions(-)
Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.os131.patch 21 Aug 2009 05:10:23 -0000 1.1
+++ workspace.os131.patch 1 Sep 2009 15:01:51 -0000 1.2
@@ -195,8 +195,8 @@ Index: sw/source/core/doc/docnew.cxx
+ {
+ for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
+ {
-+ const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
-+ if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
++ const SfxPoolItem& rSourceAttr = aAttrPool.GetDefaultItem( nWhich );
++ if( rSourceAttr != pRet->aAttrPool.GetDefaultItem( nWhich ) )
+ aNewDefaults.Put( rSourceAttr );
+ }
+ nRange += 2;
@@ -976,7 +976,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
#include <mmconfigitem.hxx>
#include <sfx2/request.hxx>
#include <hintids.hxx>
-@@ -3182,7 +3164,10 @@
+@@ -3176,7 +3158,10 @@
SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
@@ -987,7 +987,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
//save the settings of the first
rSourceShell.SttEndDoc(TRUE);
USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3192,6 +3177,8 @@
+@@ -3186,6 +3171,8 @@
try
{
@@ -996,7 +996,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
// save the working document into a temporary location
sSourceDocURL = URIHelper::SmartRel2Abs(
INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3207,7 +3194,7 @@
+@@ -3201,7 +3188,7 @@
pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( sSourceDocURL, aValues );
@@ -1005,7 +1005,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
// create a target docshell to put the merged document into
SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
xTargetDocShell->DoInitNew( 0 );
-@@ -3256,6 +3243,15 @@
+@@ -3250,6 +3237,15 @@
Application::Reschedule();
}
@@ -1021,7 +1021,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
// create a new docshell from the temporary document
SfxBoolItem aHidden( SID_HIDDEN, TRUE );
SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3265,9 +3261,13 @@
+@@ -3259,9 +3255,13 @@
rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
&aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
if(pReturnValue)
@@ -1035,14 +1035,16 @@ Index: sw/source/ui/dbui/dbmgr.cxx
SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
-@@ -3387,8 +3387,11 @@
+@@ -3381,8 +3381,11 @@
{
- DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
+ DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments")
}
+- if(sSourceDocURL.Len())
+- File::remove( sSourceDocURL );
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
- if(sSourceDocURL.Len())
- File::remove( sSourceDocURL );
++ if(sSourceDocURL.Len())
++ File::remove( sSourceDocURL );
+#endif
DELETEZ(pImpl->pMergeData);
bInMerge = FALSE;
workspace.pdfextfix02.patch:
config/description.xml | 2
inc/wrapper.hxx | 8
pdfiadaptor.cxx | 19 +
pdfiadaptor.hxx | 2
test/tests.cxx | 8
tree/drawtreevisiting.cxx | 14 +
tree/genericelements.hxx | 3
tree/pdfiprocessor.cxx | 78 ++++++-
wrapper/wrapper.cxx | 160 ++++++++++++---
xpdfwrapper/makefile.mk | 3
xpdfwrapper/pdfioutdev_gpl.cxx | 246 +++++++++++++++++-------
xpdfwrapper/pdfioutdev_gpl.hxx | 6
xpdfwrapper/pnghelper.cxx | 411 +++++++++++++++++++++++++++++++++++++++++
xpdfwrapper/pnghelper.hxx | 92 +++++++++
xpdfwrapper/wrapper_gpl.cxx | 50 +++-
15 files changed, 956 insertions(+), 146 deletions(-)
Index: workspace.pdfextfix02.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.pdfextfix02.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.pdfextfix02.patch 21 Aug 2009 05:08:22 -0000 1.2
+++ workspace.pdfextfix02.patch 1 Sep 2009 15:01:51 -0000 1.3
@@ -357,7 +357,7 @@ Index: sdext/source/pdfimport/tree/pdfip
===================================================================
--- sdext/source/pdfimport/tree/pdfiprocessor.cxx (.../tags/OOO310_m11) (revision 272982)
+++ sdext/source/pdfimport/tree/pdfiprocessor.cxx (.../cws/pdfextfix02) (revision 272982)
-@@ -374,9 +374,10 @@
+@@ -362,9 +362,10 @@
else
{
if (
@@ -371,87 +371,19 @@ Index: sdext/source/pdfimport/tree/pdfip
( m_GlyphsList[i].getPrevGlypthsSpace() == 0.0 )
)
{
-@@ -451,45 +452,45 @@
- const geometry::Matrix2D& rFontMatrix )
- {
- double isFirstLine= fYPrevTextPosition+ fXPrevTextPosition+ fPrevTextHeight+ fPrevTextWidth ;
--
-+
- if(
-- ( ( ( fYPrevTextPosition!= rRect.Y1 ) ) ||
-- ( ( fXPrevTextPosition > rRect.X2 ) ) ||
-- ( ( fXPrevTextPosition+fPrevTextWidth*1.3)<rRect.X1 )
-+ ( ( ( fYPrevTextPosition!= rRect.Y1 ) ) ||
-+ ( ( fXPrevTextPosition > rRect.X2 ) ) ||
-+ ( ( fXPrevTextPosition+fPrevTextWidth*1.3)<rRect.X1 )
- ) && ( isFirstLine> 0.0 )
-- )
-+ )
- {
- processGlyphLine();
--
-+
- }
--
-- CharGlyph aGlyph;
--
-- aGlyph.setGlyph ( rGlyphs );
-- aGlyph.setRect ( rRect );
-- aGlyph.setFontMatrix ( rFontMatrix );
-- aGlyph.setGraphicsContext ( getCurrentContext() );
-- getGCId(getCurrentContext());
-- aGlyph.setCurElement( m_pCurElement );
--
-- aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-- aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-- aGlyph.setPrevGlyphHeight ( fPrevTextHeight );
-- aGlyph.setPrevGlyphWidth ( fPrevTextWidth );
--
-- m_GlyphsList.push_back( aGlyph );
--
-- fYPrevTextPosition = rRect.Y1;
-- fXPrevTextPosition = rRect.X2;
-- fPrevTextHeight = rRect.Y2-rRect.Y1;
-- fPrevTextWidth = rRect.X2-rRect.X1;
--
-- if( !m_bIsWhiteSpaceInLine )
-- {
+@@ -474,8 +475,9 @@
+
+ if( !m_bIsWhiteSpaceInLine )
+ {
- rtl::OUString tempWhiteSpaceStr( 32 );
- m_bIsWhiteSpaceInLine=rGlyphs.equals( tempWhiteSpaceStr );
-- }
--
-+
-+ CharGlyph aGlyph;
-+
-+ aGlyph.setGlyph ( rGlyphs );
-+ aGlyph.setRect ( rRect );
-+ aGlyph.setFontMatrix ( rFontMatrix );
-+ aGlyph.setGraphicsContext ( getCurrentContext() );
-+ getGCId(getCurrentContext());
-+ aGlyph.setCurElement( m_pCurElement );
-+
-+ aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-+ aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-+ aGlyph.setPrevGlyphHeight ( fPrevTextHeight );
-+ aGlyph.setPrevGlyphWidth ( fPrevTextWidth );
-+
-+ m_GlyphsList.push_back( aGlyph );
-+
-+ fYPrevTextPosition = rRect.Y1;
-+ fXPrevTextPosition = rRect.X2;
-+ fPrevTextHeight = rRect.Y2-rRect.Y1;
-+ fPrevTextWidth = rRect.X2-rRect.X1;
-+
-+ if( !m_bIsWhiteSpaceInLine )
-+ {
-+ static rtl::OUString tempWhiteSpaceStr( 0x20 );
-+ static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 );
-+ m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
-+ }
- }
++ static rtl::OUString tempWhiteSpaceStr( 0x20 );
++ static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 );
++ m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
+ }
- GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph )
-@@ -576,22 +577,70 @@
+ }
+@@ -564,22 +566,70 @@
{
const GraphicsContext& rGC( getCurrentContext() );
@@ -474,7 +406,7 @@ Index: sdext/source/pdfimport/tree/pdfip
+ aTrans.identity();
+ aTrans.scale( aScale.getX(), aScale.getY() );
+ aTrans.rotate( -fRotate );
-
++
+ basegfx::B2DRange aRect( 0, 0, 1, 1 );
+ aRect.transform( aTrans );
+
@@ -505,7 +437,7 @@ Index: sdext/source/pdfimport/tree/pdfip
+ // transform unit rect to determine view box
+ basegfx::B2DRange aRect( 0, 0, 1, 1 );
+ aRect.transform( aTrans );
-+
+
// TODO(F3): Handle clip
const sal_Int32 nGCId = getGCId(rGC);
FrameElement* pFrame = m_pElFactory->createFrameElement( m_pCurElement, nGCId );
More information about the fedora-extras-commits
mailing list