rpms/openoffice.org/devel workspace.notes2.patch, NONE, 1.1 openoffice.org.spec, 1.1355, 1.1356 openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Dec 5 12:42:48 UTC 2007
- Previous message (by thread): rpms/tog-pegasus/devel tog-pegasus.spec,1.53,1.54
- Next message (by thread): rpms/util-linux-ng/F-8 util-linux-ng-2.13-hwclock-ENODEV.patch, NONE, 1.1 util-linux-ng-2.13-mkswap-selinux.patch, NONE, 1.1 util-linux-ng-2.13-mount-canonicalize.patch, NONE, 1.1 util-linux-ng-2.13-setarch-alpha.patch, NONE, 1.1 util-linux-ng.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8568
Modified Files:
openoffice.org.spec
Added Files:
workspace.notes2.patch
Removed Files:
openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
Log Message:
Resolves: rhbz#206400 add workspace.notes2.patch
workspace.notes2.patch:
--- NEW FILE workspace.notes2.patch ---
Index: framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
diff -u framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9 framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9.28.1
--- framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx:1.9 Thu Sep 6 06:09:46 2007
+++ framework/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx Sun Dec 2 15:10:53 2007
@@ -97,7 +97,6 @@
/*N*/ Color SwViewOption::aFieldShadingsColor(COL_LIGHTGRAY);
/*N*/ Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY);
/*M*/ Color SwViewOption::aPageBreakColor(COL_BLUE);
-/*N*/ Color SwViewOption::aNotesIndicatorColor(COL_YELLOW);
/*N*/ Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
/*N*/
/*N*/ sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
@@ -393,7 +392,6 @@
/*N*/ aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS);
/*N*/ aPageBreakColor.SetColor(aValue.nColor);
/*N*/
-/*N*/ aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERNOTESINDICATOR).nColor);
/*N*/ aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
/*N*/ }
/* -----------------------------23.04.2002 17:48------------------------------
Index: util/svtools/inc/svtools/colorcfg.hxx
diff -u util/svtools/inc/svtools/colorcfg.hxx:1.3 util/svtools/inc/svtools/colorcfg.hxx:1.3.154.1
--- util/svtools/inc/svtools/colorcfg.hxx:1.3 Wed Jun 27 06:44:14 2007
+++ util/svtools/inc/svtools/colorcfg.hxx Sun Dec 2 12:54:44 2007
@@ -77,7 +77,6 @@
WRITERFIELDSHADINGS ,
WRITERIDXSHADINGS ,
WRITERDIRECTCURSOR ,
- WRITERNOTESINDICATOR,
WRITERSCRIPTINDICATOR,
WRITERSECTIONBOUNDARIES,
WRITERPAGEBREAKS,
Index: util/svtools/source/config/colorcfg.cxx
diff -u util/svtools/source/config/colorcfg.cxx:1.17 util/svtools/source/config/colorcfg.cxx:1.17.140.1
--- util/svtools/source/config/colorcfg.cxx:1.17 Fri Jul 6 03:04:05 2007
+++ util/svtools/source/config/colorcfg.cxx Sun Dec 2 12:54:44 2007
@@ -200,7 +200,6 @@
{ RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings") ,sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterDirectCursor") ,sal_True },
- { RTL_CONSTASCII_USTRINGPARAM("/WriterNotesIndicator") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterScriptIndicator") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterSectionBoundaries") ,sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterPageBreaks") ,sal_False },
@@ -569,8 +568,7 @@
0xc0c0c0, // WRITERFIELDSHADIN
0xc0c0c0, // WRITERIDXSHADINGS
0, // WRITERDIRECTCURSOR
- COL_YELLOW, //WRITERNOTESINDICATOR
- COL_GREEN, //WRITERSCRIPTINDICATOR
+ COL_GREEN, //WRITERSCRIPTINDICATOR
0xc0c0c0, //WRITERSECTIONBOUNDARIES
COL_BLUE, //WRITERPAGEBREAKS,
COL_LIGHTBLUE, // HTMLSGML
Index: sw/sw/inc/viewopt.hxx
diff -u sw/sw/inc/viewopt.hxx:1.27 sw/sw/inc/viewopt.hxx:1.27.6.1
--- sw/sw/inc/viewopt.hxx:1.27 Mon Nov 26 09:28:22 2007
+++ sw/sw/inc/viewopt.hxx Sun Dec 2 12:27:10 2007
@@ -156,7 +156,6 @@
static Color aFieldShadingsColor;
static Color aSectionBoundColor;
static Color aPageBreakColor;
- static Color aNotesIndicatorColor;
static Color aScriptIndicatorColor;
static sal_Int32 nAppearanceFlags; //
Index: sw/sw/source/ui/config/viewopt.cxx
diff -u sw/sw/source/ui/config/viewopt.cxx:1.29 sw/sw/source/ui/config/viewopt.cxx:1.29.6.3
--- sw/sw/source/ui/config/viewopt.cxx:1.29 Mon Nov 26 09:33:44 2007
+++ sw/sw/source/ui/config/viewopt.cxx Sun Dec 2 15:18:45 2007
@@ -109,7 +109,6 @@
Color SwViewOption::aFieldShadingsColor(COL_LIGHTGRAY);
Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY);
Color SwViewOption::aPageBreakColor(COL_BLUE);
-Color SwViewOption::aNotesIndicatorColor(COL_YELLOW);
Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
@@ -205,8 +204,7 @@
* SwViewOption::PaintPostIts()
*************************************************************************/
-void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect,
- sal_Bool bIsScript ) const
+void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool /*bIsScript*/ ) const
{
if( pOut )
{
@@ -219,9 +217,8 @@
const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix );
const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix );
const SwRect aRect( aTopLeft, aBotRight );
- sal_Int32 nColor = bIsScript ? aScriptIndicatorColor.GetColor() : aNotesIndicatorColor.GetColor();
- DrawRect( pOut, aRect, nColor );
- pOut->SetLineColor( aOldLineColor );
+ DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() );
+ pOut->SetLineColor( aOldLineColor );
}
}
@@ -609,7 +606,6 @@
aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS);
aPageBreakColor.SetColor(aValue.nColor);
- aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERNOTESINDICATOR).nColor);
aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
}
/* -----------------------------23.04.2002 17:48------------------------------
Index: graphics/svx/inc/optcolor.hrc
diff -u graphics/svx/inc/optcolor.hrc:1.5 graphics/svx/inc/optcolor.hrc:1.5.206.1
--- graphics/svx/inc/optcolor.hrc:1.5 Fri Jul 6 00:29:21 2007
+++ graphics/svx/inc/optcolor.hrc Sun Dec 2 12:28:07 2007
@@ -95,9 +95,6 @@
#define LB_WRITERDIRECTCURSOR 71
#define FT_WRITERDIRECTCURSOR 72
#define WN_WRITERDIRECTCURSOR 73
-#define LB_WRITERNOTESINDICATOR 74
-#define FT_WRITERNOTESINDICATOR 75
-#define WN_WRITERNOTESINDICATOR 76
#define LB_WRITERSCRIPTINDICATOR 77
#define FT_WRITERSCRIPTINDICATOR 78
#define WN_WRITERSCRIPTINDICATOR 79
Index: graphics/svx/source/dialog/optcolor.cxx
diff -u graphics/svx/source/dialog/optcolor.cxx:1.16 graphics/svx/source/dialog/optcolor.cxx:1.16.6.1
--- graphics/svx/source/dialog/optcolor.cxx:1.16 Tue Nov 20 11:21:22 2007
+++ graphics/svx/source/dialog/optcolor.cxx Sun Dec 2 12:28:07 2007
@@ -165,9 +165,6 @@
CheckBox aWrtIdxShadingBackCB;
ColorListBox aWrtIdxShadingBackLB;
Window aWrtIdxShadingBackWN;
- FixedText aWrtNotesIndicatorFT;
- ColorListBox aWrtNotesIndicatorLB;
- Window aWrtNotesIndicatorWN;
FixedText aWrtScriptIndicatorFT;
ColorListBox aWrtScriptIndicatorLB;
Window aWrtScriptIndicatorWN;
@@ -330,7 +327,6 @@
case WRITERFIELDSHADINGS :
case WRITERIDXSHADINGS :
case WRITERDIRECTCURSOR :
- case WRITERNOTESINDICATOR :
case WRITERSCRIPTINDICATOR :
case WRITERSECTIONBOUNDARIES :
case WRITERPAGEBREAKS :
@@ -433,9 +429,6 @@
aWrtIdxShadingBackCB(this, ResId( CB_WRITERIDXSHADINGS, *rResId.GetResMgr())),
aWrtIdxShadingBackLB(this, ResId( LB_WRITERIDXSHADINGS, *rResId.GetResMgr())),
aWrtIdxShadingBackWN(this, ResId( WN_WRITERIDXSHADINGS, *rResId.GetResMgr())),
- aWrtNotesIndicatorFT(this, ResId( FT_WRITERNOTESINDICATOR, *rResId.GetResMgr())),
- aWrtNotesIndicatorLB(this, ResId( LB_WRITERNOTESINDICATOR, *rResId.GetResMgr())),
- aWrtNotesIndicatorWN(this, ResId( WN_WRITERNOTESINDICATOR, *rResId.GetResMgr())),
aWrtScriptIndicatorFT(this, ResId( FT_WRITERSCRIPTINDICATOR, *rResId.GetResMgr())),
aWrtScriptIndicatorLB(this, ResId( LB_WRITERSCRIPTINDICATOR, *rResId.GetResMgr())),
aWrtScriptIndicatorWN(this, ResId( WN_WRITERSCRIPTINDICATOR, *rResId.GetResMgr())),
@@ -536,8 +529,7 @@
aCheckBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldCB ;
aCheckBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackCB ;
aFixedTexts[WRITERDIRECTCURSOR ]=& aWrtDirectCrsrFT;
- aFixedTexts[WRITERNOTESINDICATOR ]=& aWrtNotesIndicatorFT;
- aFixedTexts[WRITERSCRIPTINDICATOR ]=& aWrtScriptIndicatorFT;
+ aFixedTexts[WRITERSCRIPTINDICATOR ]=& aWrtScriptIndicatorFT;
aCheckBoxes[WRITERSECTIONBOUNDARIES ]=& aWrtSectionBoundCB;
aFixedTexts[HTMLSGML ]=& aHTMLSGMLFT;
aFixedTexts[HTMLCOMMENT ]=& aHTMLCommentFT;
@@ -575,7 +567,6 @@
aColorBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldLB ;
aColorBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackLB ;
aColorBoxes[WRITERDIRECTCURSOR ] = &aWrtDirectCrsrLB ;
- aColorBoxes[WRITERNOTESINDICATOR ] = &aWrtNotesIndicatorLB ;
aColorBoxes[WRITERSCRIPTINDICATOR ] = &aWrtScriptIndicatorLB ;
aColorBoxes[WRITERSECTIONBOUNDARIES ] = &aWrtSectionBoundLB ;
aColorBoxes[WRITERPAGEBREAKS] = &aWrtPageBreaksLB;
@@ -614,7 +605,6 @@
aWindows[WRITERFIELDSHADINGS ] = &aWrtFieldWN ;
aWindows[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackWN ;
aWindows[WRITERDIRECTCURSOR ] = &aWrtDirectCrsrWN ;
- aWindows[WRITERNOTESINDICATOR ] = &aWrtNotesIndicatorWN ;
aWindows[WRITERSCRIPTINDICATOR ] = &aWrtScriptIndicatorWN ;
aWindows[WRITERSECTIONBOUNDARIES ] = &aWrtSectionBoundWN ;
aWindows[WRITERPAGEBREAKS] = &aWrtPageBreaksWN;
Index: graphics/svx/source/options/optcolor.src
diff -u graphics/svx/source/options/optcolor.src:1.44 graphics/svx/source/options/optcolor.src:1.44.128.2
--- graphics/svx/source/options/optcolor.src:1.44 Fri Aug 17 05:25:33 2007
+++ graphics/svx/source/options/optcolor.src Sun Dec 2 12:42:27 2007
@@ -246,26 +246,20 @@
};
LB_WN( WRITERIDXSHADINGS, 14 )
- FixedText FT_WRITERNOTESINDICATOR
- {
- FT_POS_SIZE( 15 );
- Text [ en-US ] = "Note indicator";
- };
- LB_WN( WRITERNOTESINDICATOR, 15 )
FixedText FT_WRITERSCRIPTINDICATOR
{
- FT_POS_SIZE( 16 );
+ FT_POS_SIZE( 15 );
[...9897 lines suppressed...]
GetExport().GetMM100UnitConverter().convertDateTime(aBuffer,
- aDateTime,
+ aDate,
sal_True);
SvXMLElementExport aDateElem( GetExport(), XML_NAMESPACE_DC,
XML_DATE, sal_True,
@@ -1870,7 +1863,19 @@
GetExport().Characters(aBuffer.makeStringAndClear());
}
- ProcessParagraphSequence(GetStringProperty(sPropertyContent,rPropSet));
+ com::sun::star::uno::Reference < com::sun::star::text::XText > xText;
+ try
+ {
+ com::sun::star::uno::Any aRet = rPropSet->getPropertyValue(sPropertyTextRange);
+ aRet >>= xText;
+ }
+ catch ( com::sun::star::uno::Exception& )
+ {}
+
+ if ( xText.is() )
+ GetExport().GetTextParagraphExport()->exportText( xText );
+ else
+ ProcessParagraphSequence(GetStringProperty(sPropertyContent,rPropSet));
break;
}
Index: xml/xmloff/source/text/txtfldi.cxx
diff -u xml/xmloff/source/text/txtfldi.cxx:1.65 xml/xmloff/source/text/txtfldi.cxx:1.65.24.2
--- xml/xmloff/source/text/txtfldi.cxx:1.65 Fri Aug 3 05:55:24 2007
+++ xml/xmloff/source/text/txtfldi.cxx Thu Nov 29 03:07:28 2007
@@ -337,6 +337,7 @@
const sal_Char sAPI_data_command_type[] = "DataCommandType";
const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage";
const sal_Char sAPI_is_visible[] = "IsVisible";
+const sal_Char sAPI_TextRange[] = "TextRange";
const sal_Char sAPI_true[] = "TRUE";
@@ -3836,7 +3837,9 @@
nPrfx, sLocalName),
sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM(sAPI_author)),
sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
- sPropertyDate(RTL_CONSTASCII_USTRINGPARAM(sAPI_date))
+ // why is there no UNO_NAME_DATE_TIME, but only UNO_NAME_DATE_TIME_VALUE?
+ sPropertyDate(RTL_CONSTASCII_USTRINGPARAM(sAPI_date_time_value)),
+ sPropertyTextRange(RTL_CONSTASCII_USTRINGPARAM(sAPI_TextRange))
{
bValid = sal_True;
}
@@ -3851,7 +3854,7 @@
SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext(
USHORT nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList >& )
+ const Reference<XAttributeList >& xAttrList )
{
SvXMLImportContext *pContext = 0;
if( XML_NAMESPACE_DC == nPrefix )
@@ -3863,13 +3866,85 @@
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
rLocalName, aDateBuffer);
}
+
if( !pContext )
- pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
- rLocalName, aTextBuffer);
+ {
+ try
+ {
+ if ( !mxField.is() )
+ CreateField( mxField, sServicePrefix + GetServiceName() );
+ Any aAny = mxField->getPropertyValue( sPropertyTextRange );
+ Reference< XText > xText;
+ aAny >>= xText;
+ if( xText.is() )
+ {
+ UniReference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport();
+ if( !mxCursor.is() )
+ {
+ mxOldCursor = xTxtImport->GetCursor();
+ mxCursor = xText->createTextCursor();
+ }
+
+ if( mxCursor.is() )
+ {
+ xTxtImport->SetCursor( mxCursor );
+ pContext = xTxtImport->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ }
+ }
+ }
+ catch ( Exception& )
+ {}
+
+ if( !pContext )
+ pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, aTextBuffer);
+ }
return pContext;
}
+void XMLAnnotationImportContext::EndElement()
+{
+ DBG_ASSERT(GetServiceName().getLength()>0, "no service name for element!");
+ if( mxCursor.is() )
+ {
+ // delete addition newline
+ const OUString aEmpty;
+ mxCursor->gotoEnd( sal_False );
+ mxCursor->goLeft( 1, sal_True );
+ mxCursor->setString( aEmpty );
+
+ // reset cursor
+ GetImport().GetTextImport()->ResetCursor();
+ }
+
+ if( mxOldCursor.is() )
+ GetImport().GetTextImport()->SetCursor( mxOldCursor );
+
+ if ( bValid )
+ {
+ if ( mxField.is() || CreateField( mxField, sServicePrefix + GetServiceName() ) )
+ {
+ // set field properties
+ PrepareField( mxField );
+
+ // attach field to document
+ Reference < XTextContent > xTextContent( mxField, UNO_QUERY );
+
+ // workaround for #80606#
+ try
+ {
+ GetImportHelper().InsertTextContent( xTextContent );
+ }
+ catch (lang::IllegalArgumentException)
+ {
+ // ignore
+ }
+ }
+ }
+ else
+ GetImportHelper().InsertString(GetContent());
+}
+
void XMLAnnotationImportContext::PrepareField(
const Reference<XPropertySet> & xPropertySet)
{
@@ -3881,20 +3956,24 @@
if (SvXMLUnitConverter::convertDateTime(aDateTime,
aDateBuffer.makeStringAndClear()))
{
+ /*
Date aDate;
aDate.Year = aDateTime.Year;
aDate.Month = aDateTime.Month;
aDate.Day = aDateTime.Day;
xPropertySet->setPropertyValue(sPropertyDate, makeAny(aDate));
+ */
+ xPropertySet->setPropertyValue(sPropertyDate, makeAny(aDateTime));
}
- // delete last paragraph mark (if necessary)
OUString sBuffer = aTextBuffer.makeStringAndClear();
- if (sal_Char(0x0a) == sBuffer.getStr()[sBuffer.getLength()-1])
+ if ( sBuffer.getLength() )
{
- sBuffer = sBuffer.copy(0, sBuffer.getLength()-1);
+ // delete last paragraph mark (if necessary)
+ if (sal_Char(0x0a) == sBuffer.getStr()[sBuffer.getLength()-1])
+ sBuffer = sBuffer.copy(0, sBuffer.getLength()-1);
+ xPropertySet->setPropertyValue(sPropertyContent, makeAny(sBuffer));
}
- xPropertySet->setPropertyValue(sPropertyContent, makeAny(sBuffer));
}
Index: xml/xmloff/source/text/txtparae.cxx
diff -u xml/xmloff/source/text/txtparae.cxx:1.138 xml/xmloff/source/text/txtparae.cxx:1.138.48.1
--- xml/xmloff/source/text/txtparae.cxx:1.138 Fri Jul 6 05:10:23 2007
+++ xml/xmloff/source/text/txtparae.cxx Thu Nov 29 03:07:28 2007
@@ -1481,6 +1481,19 @@
Any aAny = xTextFieldsEnum->nextElement();
Reference< XTextField > xTextField = *(Reference<XTextField>*)aAny.getValue();
exportTextField( xTextField->getAnchor(), bAutoStyles );
+ try
+ {
+ Reference < XPropertySet > xSet( xTextField, UNO_QUERY );
+ Reference < XText > xText;
+ Any a = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("TextRange") );
+ a >>= xText;
+ if ( xText.is() )
+ exportText( xText, sal_True, bIsProgress, bExportContent );
+ GetExport().GetTextParagraphExport()->collectTextAutoStyles( xText );
+ }
+ catch (Exception&)
+ {
+ }
}
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1355
retrieving revision 1.1356
diff -u -r1.1355 -r1.1356
--- openoffice.org.spec 1 Dec 2007 20:38:09 -0000 1.1355
+++ openoffice.org.spec 5 Dec 2007 12:42:15 -0000 1.1356
@@ -1,6 +1,6 @@
%define oootag OOG680
%define ooomilestone 9
-%define rh_rpm_release 6
+%define rh_rpm_release 7
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -147,19 +147,19 @@
Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
Patch63: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
Patch64: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
-Patch65: openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
-Patch66: workspace.fpicker7.patch
-Patch67: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch68: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch69: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch70: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
-Patch71: openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
-Patch72: workspace.sw8u10bf02.patch
-Patch73: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
-Patch74: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch75: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
-Patch76: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
-Patch77: workspace.cmcfixes39.patch
+Patch65: workspace.fpicker7.patch
+Patch66: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch67: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch68: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch69: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
+Patch70: openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
+Patch71: workspace.sw8u10bf02.patch
+Patch72: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
+Patch73: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch74: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
+Patch75: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
+Patch76: workspace.cmcfixes39.patch
+Patch77: workspace.notes2.patch
%define instdir %{_libdir}/openoffice.org
@@ -1104,19 +1104,19 @@
%patch62 -p1 -b .ooo74751.bean.mawt.patch
%patch63 -p1 -b .ooo81321.cppu.silencewarnings.patch
%patch64 -p1 -b .ooo81936.sc.maketypesagree.patch
-%patch65 -p1 -b .ooo53885.raiseannotationpriority.sw.patch
-%patch66 -p1 -b .workspace.fpicker7.patch
-%patch67 -p1 -b .ooo76649.httpencoding.patc
-%patch68 -p1 -b .ooo82966.svx.missing3d.patch
-%patch69 -p1 -b .ooo81307.sw.word2.patch
-%patch70 -p1 -b .ooo83591.vcl.checkboxes.patch
-%patch71 -p1 -b .ooo82911.sd.insertbackground.patch
-%patch72 -p1 -b .workspace.sw8u10bf02.patch
-%patch73 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
-%patch74 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch75 -p1 -b .ooo83930.sw.flushanchors.patch
-%patch76 -p1 -b .ooo84001.slideshow.gccisaprick.patch
-%patch77 -p1 -b .workspace.cmcfixes39.patch
+%patch65 -p1 -b .workspace.fpicker7.patch
+%patch66 -p1 -b .ooo76649.httpencoding.patc
+%patch67 -p1 -b .ooo82966.svx.missing3d.patch
+%patch68 -p1 -b .ooo81307.sw.word2.patch
+%patch69 -p1 -b .ooo83591.vcl.checkboxes.patch
+%patch70 -p1 -b .ooo82911.sd.insertbackground.patch
+%patch71 -p1 -b .workspace.sw8u10bf02.patch
+%patch72 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
+%patch73 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch74 -p1 -b .ooo83930.sw.flushanchors.patch
+%patch75 -p1 -b .ooo84001.slideshow.gccisaprick.patch
+%patch76 -p1 -b .workspace.cmcfixes39.patch
+%patch77 -p1 -b .workspace.notes2.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2381,6 +2381,7 @@
fi
fi
done
+rm -f %{instdir}/share/uno_packages/cache/*
%files base
%defattr(-,root,root,-)
@@ -2836,6 +2837,11 @@
%changelog
+* Mon Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.7
+- Resolves: rhbz#206400 add long awaited workspace.notes2.patch
+ + drop openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
+ integrated
+
* Sat Dec 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.6
- add workspace.cmcfixes39.patch for ooo#83751 and use system writer2latex
--- openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch DELETED ---
- Previous message (by thread): rpms/tog-pegasus/devel tog-pegasus.spec,1.53,1.54
- Next message (by thread): rpms/util-linux-ng/F-8 util-linux-ng-2.13-hwclock-ENODEV.patch, NONE, 1.1 util-linux-ng-2.13-mkswap-selinux.patch, NONE, 1.1 util-linux-ng-2.13-mount-canonicalize.patch, NONE, 1.1 util-linux-ng-2.13-setarch-alpha.patch, NONE, 1.1 util-linux-ng.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list