rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.6, 1.7 workspace.cairotext01.patch, 1.2, 1.3 workspace.notes2.patch, 1.3, 1.4
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Feb 5 16:26:24 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7278
Modified Files:
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
workspace.cairotext01.patch workspace.notes2.patch
Log Message:
make sure font size is right
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Feb 2008 09:03:24 -0000 1.6
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Feb 2008 16:25:54 -0000 1.7
@@ -3278,8 +3278,8 @@
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LocaleCodes.java,v
retrieving revision 1.5
diff -u -r1.5 LocaleCodes.java
---- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
-+++ openoffice.org/wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
+--- wizards.orig/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
++++ wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
@@ -12,7 +12,7 @@
public LocaleCodes (XMultiServiceFactory xmsf) {
workspace.cairotext01.patch:
Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cairotext01.patch 1 Feb 2008 08:57:46 -0000 1.2
+++ workspace.cairotext01.patch 5 Feb 2008 16:25:54 -0000 1.3
@@ -13,15 +13,36 @@
const ImplFontSelectData& GetFontSelData() const { return maFontSelData; }
+Index: gsl/vcl/source/glyphs/gcach_ftyp.cxx
+diff -u gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147 gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147.96.1
+--- gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147 Mon Nov 26 07:13:41 2007
++++ gsl/vcl/source/glyphs/gcach_ftyp.cxx Tue Feb 5 08:22:27 2008
+@@ -518,6 +518,16 @@
+
+ // -----------------------------------------------------------------------
+
++void* FreetypeServerFont::GetFtFace() const
++{
++ if( maSizeFT )
++ pFTActivateSize( maSizeFT );
++
++ return maFaceFT;
++}
++
++// -----------------------------------------------------------------------
++
+ FreetypeManager::~FreetypeManager()
+ {
+ // This crashes on Solaris 10
Index: gsl/vcl/source/glyphs/gcach_ftyp.hxx
-diff -u gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39 gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39.180.1
+diff -u gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39 gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39.180.2
--- gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39 Tue Jul 31 09:09:30 2007
-+++ gsl/vcl/source/glyphs/gcach_ftyp.hxx Fri Jan 25 00:53:46 2008
++++ gsl/vcl/source/glyphs/gcach_ftyp.hxx Tue Feb 5 08:22:27 2008
@@ -185,6 +185,10 @@
virtual const ::rtl::OString* GetFontFileName() const { return mpFontInfo->GetFontFileName(); }
virtual int GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); }
virtual bool TestFont() const;
-+ virtual void* GetFtFace() const { return maFaceFT; }
++ virtual void* GetFtFace() const;
+ virtual int GetLoadFlags() const { return mnLoadFlags; }
+ virtual bool NeedsArtificialBold() const { return mbArtBold; }
+ virtual bool NeedsArtificialItalic() const { return mbArtItalic; }
workspace.notes2.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 workspace.notes2.patch
Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.notes2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.notes2.patch 15 Jan 2008 10:09:58 -0000 1.3
+++ workspace.notes2.patch 5 Feb 2008 16:25:54 -0000 1.4
@@ -1,263 +1,62 @@
-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 );
[...14900 lines suppressed...]
-@@ -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);
-+ }
+ FixedText FT_BASICCOMMENT
+ {
+- FT_POS_SIZE( 38 );
++ FT_POS_SIZE( 37 );
+ Text [ en-US ] = "Comment";
+ };
+- LB_WN( BASICCOMMENT, 38 )
++ LB_WN( BASICCOMMENT, 37 )
- return pContext;
- }
+ FixedText FT_BASICNUMBER
+ {
+- FT_POS_SIZE( 39 );
++ FT_POS_SIZE( 38 );
+ Text [ en-US ] = "Number";
+ };
+- LB_WN( BASICNUMBER, 39 )
++ LB_WN( BASICNUMBER, 38)
-+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));
- }
+ FixedText FT_BASICSTRING
+ {
+- FT_POS_SIZE( 40 );
++ FT_POS_SIZE( 39 );
+ Text [ en-US ] = "String";
+ };
+- LB_WN( BASICSTRING, 40 )
++ LB_WN( BASICSTRING, 39 )
-- // 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));
- }
+ FixedText FT_BASICOPERATOR
+ {
+- FT_POS_SIZE( 41 );
++ FT_POS_SIZE( 40 );
+ Text [ en-US ] = "Operator";
+ };
+- LB_WN( BASICOPERATOR, 41 )
++ LB_WN( BASICOPERATOR, 40 )
+ FixedText FT_BASICKEYWORD
+ {
+- FT_POS_SIZE( 42 );
++ FT_POS_SIZE( 41 );
+ Text [ en-US ] = "Reserved expression";
+ };
+- LB_WN( BASICKEYWORD, 42 )
++ LB_WN( BASICKEYWORD, 41 )
-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&)
-+ {
-+ }
- }
- }
+ FixedText FT_BASICERROR
+ {
+- FT_POS_SIZE( 43 );
++ FT_POS_SIZE( 42 );
+ Text [ en-US ] = "Error";
+ };
+- LB_WN( BASICERROR, 43 )
++ LB_WN( BASICERROR, 42 )
+ String ST_EXTENSION
+ {
More information about the fedora-extras-commits
mailing list