[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/openoffice.org/FC-4 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.4, 1.5 openoffice.org-1.9.84.ooo44846.svxcasting.patch, 1.2, 1.3 openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, 1.2, 1.3 openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch, 1.1, 1.2 openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch, 1.3, 1.4 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, 1.4, 1.5 workspace.gslpatches2.patch, 1.1, 1.2 workspace.vcl39.patch, 1.1, 1.2
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/openoffice.org/FC-4 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.4, 1.5 openoffice.org-1.9.84.ooo44846.svxcasting.patch, 1.2, 1.3 openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, 1.2, 1.3 openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch, 1.1, 1.2 openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch, 1.3, 1.4 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, 1.4, 1.5 workspace.gslpatches2.patch, 1.1, 1.2 workspace.vcl39.patch, 1.1, 1.2
- Date: Thu, 14 Jul 2005 04:11:10 -0400
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv567
Modified Files:
openoffice.org-1.9.104-use-fontconfig-everywhere.patch
openoffice.org-1.9.84.ooo44846.svxcasting.patch
openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
workspace.gslpatches2.patch workspace.vcl39.patch
Log Message:
changed patches
openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
inc/outdev.h | 0
inc/outfont.hxx | 0
inc/psprint/fontmanager.hxx | 0
psprint/inc/psprint/fontmanager.hxx | 4
psprint/source/fontmanager/fontcache.cxx | 2
psprint/source/fontmanager/fontconfig.cxx | 20 +
source/fontmanager/fontcache.cxx | 0
source/fontmanager/fontconfig.cxx | 0
source/gdi/outdev3.cxx | 0
util/makefile.mk | 0
vcl/inc/outdev.h | 3
vcl/inc/outfont.hxx | 15 +
vcl/source/gdi/outdev3.cxx | 411 +++++++++++++++++++++++-------
vcl/util/makefile.mk | 2
14 files changed, 366 insertions(+), 91 deletions(-)
Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch 28 Jun 2005 11:28:49 -0000 1.4
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch 14 Jul 2005 08:11:08 -0000 1.5
@@ -1,6 +1,28 @@
---- SRC680_m104/vcl/inc/outfont.hxx.fontconfig 2005-05-24 15:12:13.000000000 -0400
-+++ SRC680_m104/vcl/inc/outfont.hxx 2005-05-26 12:22:42.000000000 -0400
-@@ -252,6 +252,7 @@
+Index: inc/outdev.h
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/outdev.h,v
+retrieving revision 1.17
+diff -u -p -r1.17 outdev.h
+--- openoffice.org.orig/vcl/inc/outdev.h 9 Nov 2004 16:32:20 -0000 1.17
++++ openoffice.org/vcl/inc/outdev.h 8 Jul 2005 16:26:15 -0000
+@@ -239,7 +239,8 @@ public:
+ const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
+ ImplFontEntry* GetFallback( ImplDevFontList* pFontList,
+ const Font& rFont, const Size& rSize,
+- int nFallbackLevel );
++ int nFallbackLevel, sal_Unicode *pMissingUnicodes,
++ int nMissingUnicodes );
+ void Release( ImplFontEntry* );
+ void Invalidate();
+ };
+Index: inc/outfont.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/outfont.hxx,v
+retrieving revision 1.17
+diff -u -p -r1.17 outfont.hxx
+--- openoffice.org.orig/vcl/inc/outfont.hxx 31 Jan 2005 09:15:19 -0000 1.17
++++ openoffice.org/vcl/inc/outfont.hxx 8 Jul 2005 16:26:15 -0000
+@@ -252,6 +252,7 @@ public:
ImplDevFontListData* FindFontFamily( const String& rFontName ) const;
ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplFontSubstEntry* pDevSpecificSubst ) const;
ImplDevFontListData* ImplFindBySearchName( const String& ) const;
@@ -8,7 +30,7 @@
bool HasFallbacks() const;
void SetFallbacks( ImplDevFontListData**, int nCount );
-@@ -354,6 +355,10 @@
+@@ -354,6 +355,10 @@ public:
ImplFontEntry( const ImplFontSelectData& );
virtual ~ImplFontEntry() {}
@@ -19,7 +41,7 @@
public: // TODO: make data members private
ImplFontSelectData maFontSelData; // FontSelectionData
ImplFontMetricData maMetric; // Font Metric
-@@ -364,6 +369,16 @@
+@@ -364,6 +369,16 @@ public: // TODO: make data members priva
short mnOwnOrientation; // text angle if lower layers don't rotate text themselves
short mnOrientation; // text angle in 3600 system
bool mbInit; // true if maMetric member is valid
@@ -36,31 +58,25 @@
};
---- SRC680_m104/vcl/inc/outdev.h.fontconfig 2005-05-24 16:53:31.000000000 -0400
-+++ SRC680_m104/vcl/inc/outdev.h 2005-05-25 11:42:33.000000000 -0400
-@@ -239,7 +239,8 @@
- const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
- ImplFontEntry* GetFallback( ImplDevFontList* pFontList,
- const Font& rFont, const Size& rSize,
-- int nFallbackLevel );
-+ int nFallbackLevel, sal_Unicode *pMissingUnicodes,
-+ int nMissingUnicodes );
- void Release( ImplFontEntry* );
- void Invalidate();
- };
---- SRC680_m104/vcl/source/gdi/outdev3.cxx.fontconfig 2005-05-25 13:09:50.000000000 -0400
-+++ SRC680_m104/vcl/source/gdi/outdev3.cxx 2005-05-27 10:33:03.000000000 -0400
-@@ -185,6 +185,9 @@
+Index: source/gdi/outdev3.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
+retrieving revision 1.200
+diff -u -p -r1.200 outdev3.cxx
+--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 18 May 2005 08:04:00 -0000 1.200
++++ openoffice.org/vcl/source/gdi/outdev3.cxx 8 Jul 2005 16:26:43 -0000
+@@ -185,6 +185,10 @@
#include <memory>
#include <algorithm>
++#include <psprint/fontmanager.hxx>
+#include <fontconfig/fontconfig.h>
+#include <tools/isolang.hxx>
+
// =======================================================================
DBG_NAMEEX( OutputDevice );
-@@ -2668,6 +2671,178 @@
+@@ -2670,6 +2674,187 @@ ImplFontCache::~ImplFontCache()
}
}
@@ -85,7 +101,7 @@
+ OString maTargetName = OUStringToOString( GetNextFontToken(pFontSelData->GetFamilyName(), nToken), RTL_TEXTENCODING_UTF8 );
+ aValue.type = FcTypeString;
+ aValue.u.s = (FcChar8*)maTargetName.getStr();
-+ FcPatternAddWeak( pPattern, FC_FAMILY, aValue, true);
++ FcPatternAdd( pPattern, FC_FAMILY, aValue, true);
+ }
+
+ ByteString aLangAttrib = ConvertLanguageToIsoByteString( pFontSelData->meLanguage );
@@ -186,10 +202,12 @@
+ FcPatternAddWeak( pPattern, FC_SPACING, aValue, true);
+ }
+
-+ FcConfigSubstitute( NULL, pPattern, FcMatchPattern );
++ psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++
++ FcConfigSubstitute( rMgr.getFontconfig(), pPattern, FcMatchPattern );
+ FcDefaultSubstitute( pPattern );
+ FcResult eResult = FcResultNoMatch;
-+ FcPattern* pResult = FcFontMatch( NULL, pPattern, &eResult );
++ FcPattern* pResult = FcFontMatch( rMgr.getFontconfig(), pPattern, &eResult );
+ FcPatternDestroy( pPattern );
+
+ if( pResult )
@@ -210,6 +228,10 @@
+ // We dont' actually want to talk to Fontconfig at all for symbol fonts
+ if (pFontSelData->IsSymbolFont())
+ return NULL;
++ // StarSymbol is a unicode font, but it still deserves the symbol flag
++ if( 0 == pFontSelData->maSearchName.CompareIgnoreCaseToAscii( "starsymbol", 10)
++ || 0 == pFontSelData->maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) )
++ return NULL;
+ ImplDevFontListData *pFontFamily = NULL;
+ FcFontSet* pSet = NULL;
+
@@ -225,9 +247,12 @@
+ if( eFileRes == FcResultMatch )
+ {
+ String aName( (sal_Char*)family, RTL_TEXTENCODING_UTF8 );
++ String aUserName(aName);
+ ImplGetEnglishSearchFontName( aName );
+ ImplFontSubstitute( aName, FONT_SUBSTITUTE_ALWAYS, pDevSpecific );
+ pFontFamily = ImplFindBySearchName( aName );
++ if (pFontFamily)
++ pFontSelData->maTargetName = aUserName;
+ }
+ }
+ FcFontSetDestroy( pSet );
@@ -239,7 +264,7 @@
// -----------------------------------------------------------------------
ImplFontEntry* ImplFontCache::Get( ImplDevFontList* pFontList,
-@@ -2705,8 +2877,12 @@
+@@ -2707,8 +2889,12 @@ ImplFontEntry* ImplFontCache::Get( ImplD
if( !pEntry ) // no direct cache hit
{
@@ -254,7 +279,7 @@
DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
aFontSelData.maSearchName = pFontFamily->GetSearchName();
-@@ -3026,109 +3202,122 @@
+@@ -3028,109 +3214,122 @@ ImplDevFontListData* ImplDevFontList::Im
// -----------------------------------------------------------------------
ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -460,7 +485,7 @@
if( pFallbackFont && !pFallbackFont->mbInit )
{
// HACK: maMetrics are irrelevant for fallback fonts, but
-@@ -3137,6 +3326,27 @@
+@@ -3139,6 +3338,27 @@ ImplFontEntry* ImplFontCache::GetFallbac
pFallbackFont->maMetric.maStyleName = String();
}
@@ -488,7 +513,7 @@
return pFallbackFont;
}
-@@ -6103,7 +6313,7 @@
+@@ -6105,7 +6325,7 @@ SalLayout* OutputDevice::ImplLayout( con
// do glyph fallback if needed
// #105768# avoid fallback for very small font sizes
if( aLayoutArgs.NeedFallback() )
@@ -497,7 +522,7 @@
pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
// position, justify, etc. the layout
-@@ -6147,6 +6357,17 @@
+@@ -6149,6 +6369,17 @@ SalLayout* OutputDevice::ImplGlyphFallba
rLayoutArgs.ResetPos();
}
#endif
@@ -515,7 +540,7 @@
ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
Size aFontSize( aFontSelData.mnWidth, aFontSelData.mnHeight );
-@@ -6163,7 +6384,8 @@
+@@ -6165,7 +6396,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
{
// find a font family suited for glyph fallback
ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
@@ -525,7 +550,7 @@
if( !pFallbackFont )
break;
-@@ -6215,6 +6437,8 @@
+@@ -6217,6 +6449,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
break;
}
@@ -534,20 +559,62 @@
if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
pSalLayout = pMultiSalLayout;
---- SRC680_m104/vcl/util/makefile.mk.fontconfig 2005-05-24 13:47:19.000000000 -0400
-+++ SRC680_m104/vcl/util/makefile.mk 2005-05-24 13:47:47.000000000 -0400
-@@ -261,7 +261,7 @@
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.69
+diff -u -p -r1.69 makefile.mk
+--- openoffice.org.orig/vcl/util/makefile.mk 17 Jun 2005 09:29:14 -0000 1.69
++++ openoffice.org/vcl/util/makefile.mk 8 Jul 2005 16:27:18 -0000
+@@ -261,7 +261,7 @@ SHL1STDLIBS += -framework Cocoa
.ENDIF
-SHL1STDLIBS += -lX11
-+SHL1STDLIBS += -lX11 -lfontconfig
++SHL1STDLIBS += -lX11 -lpsp$(VERSION)$(DLLPOSTFIX) -lfontconfig
.ENDIF # "$(GUI)"=="UNX"
---- SRC680_m104/psprint/source/fontmanager/fontcache.cxx.fontconfig 2005-05-24 15:34:26.000000000 -0400
-+++ SRC680_m104/psprint/source/fontmanager/fontcache.cxx 2005-05-24 15:34:33.000000000 -0400
-@@ -703,9 +703,9 @@
+Index: inc/psprint/fontmanager.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
+retrieving revision 1.22
+diff -u -p -r1.22 fontmanager.hxx
+--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 31 Jan 2005 08:58:54 -0000 1.22
++++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 8 Jul 2005 16:05:06 -0000
+@@ -79,7 +79,7 @@
+ #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
+ #include <com/sun/star/lang/Locale.hpp>
+ #endif
+-
++#include <fontconfig/fontconfig.h>
+ #define ATOM_FAMILYNAME 2
+ #define ATOM_PSNAME 3
+
+@@ -415,6 +442,7 @@ class PrintFontManager
+ std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+
+ mutable FontCache* m_pFontCache;
++ FcConfig *mpFontConfig;
+
+ rtl::OString getAfmFile( PrintFont* pFont ) const;
+ rtl::OString getFontFile( PrintFont* pFont ) const;
+@@ -468,6 +496,7 @@ class PrintFontManager
+ ~PrintFontManager();
+ public:
+ static PrintFontManager& get(); // one instance only
++ FcConfig *getFontconfig() { return mpFontConfig; }
+
+ int addFontFile( const rtl::OString& rFileName, int nFaceNum );
+
+Index: source/fontmanager/fontcache.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
+retrieving revision 1.13
+diff -u -p -r1.13 fontcache.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx 6 Jun 2005 16:07:21 -0000 1.13
++++ openoffice.org/psprint/source/fontmanager/fontcache.cxx 8 Jul 2005 16:05:07 -0000
+@@ -703,9 +703,9 @@ bool FontCache::getFontCacheFile( int nD
FontDirMap::const_iterator entry = dir->second.m_aEntries.find( rFile );
if( entry != dir->second.m_aEntries.end() )
{
@@ -558,3 +625,78 @@
PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
rNewFonts.push_back( pFont );
}
+Index: source/fontmanager/fontconfig.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
+retrieving revision 1.7
+diff -u -p -r1.7 fontconfig.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 13 Oct 2004 08:22:03 -0000 1.7
++++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 8 Jul 2005 16:05:07 -0000
+@@ -113,6 +113,8 @@ class FontCfgWrapper
+ FcPattern* (*m_pFcPatternCreate)();
+ void (*m_pFcPatternDestroy)(FcPattern*);
+ FcFontSet* (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
++ FcBool (*m_pFcConfigAppFontAddFile)(FcConfig*,const char *);
++ FcConfig* (*m_pFcConfigCreate)(void);
+ FcFontSet* (*m_pFcFontSetCreate)();
+ void (*m_pFcFontSetDestroy)(FcFontSet*);
+ FcBool (*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
+@@ -164,6 +166,12 @@ public:
+
+ FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
+ { return m_pFcFontList( pConfig, pPattern, pSet ); }
++
++ FcBool FcConfigAppFontAddFile( FcConfig* pConfig, const char *file )
++ { return m_pFcConfigAppFontAddFile( pConfig, file); }
++
++ FcConfig* FcConfigCreate( void )
++ { return m_pFcConfigCreate(); }
+
+ FcFontSet* FcFontSetCreate()
+ { return m_pFcFontSetCreate(); }
+@@ -239,6 +247,10 @@ FontCfgWrapper::FontCfgWrapper()
+ loadSymbol( "FcPatternDestroy" );
+ m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
+ loadSymbol( "FcFontList" );
++ m_pFcConfigAppFontAddFile = (FcBool(*)(FcConfig*,const char*))
++ loadSymbol( "FcConfigAppFontAddFile" );
++ m_pFcConfigCreate = (FcConfig*(*)())
++ loadSymbol( "FcConfigCreate" );
+ m_pFcFontSetCreate = (FcFontSet*(*)())
+ loadSymbol( "FcFontSetCreate" );
+ m_pFcFontSetDestroy = (void(*)(FcFontSet*))
+@@ -271,6 +283,8 @@ FontCfgWrapper::FontCfgWrapper()
+ m_pFcPatternCreate &&
+ m_pFcPatternDestroy &&
+ m_pFcFontList &&
++ m_pFcConfigAppFontAddFile &&
++ m_pFcConfigCreate &&
+ m_pFcFontSetCreate &&
+ m_pFcFontSetDestroy &&
+ m_pFcFontSetAdd &&
+@@ -330,12 +344,15 @@ void FontCfgWrapper::release()
+ bool PrintFontManager::initFontconfig()
+ {
+ int nFonts = 0;
++ mpFontConfig = 0;
+
+ #ifdef ENABLE_FONTCONFIG
+ FontCfgWrapper& rWrapper = FontCfgWrapper::get();
+ if( ! rWrapper.isValid() )
+ return false;
+
++ mpFontConfig = rWrapper.FcConfigCreate();
++
+ FcConfig* pConfig = rWrapper.getDefConfig();
+ FcObjectSet* pOSet = rWrapper.FcObjectSetBuild( FC_FAMILY,
+ FC_STYLE,
+@@ -394,6 +411,9 @@ bool PrintFontManager::initFontconfig()
+ if( eOutRes == FcResultMatch && ! outline )
+ continue;
+
++ /*cmc add only acceptable fonts to our config, for future fontconfig use*/
++ rWrapper.FcConfigAppFontAddFile(mpFontConfig, (const char*)file);
++
+ // see if this font is already cached
+ // update attributes
+ std::list< PrintFont* > aFonts;
openoffice.org-1.9.84.ooo44846.svxcasting.patch:
bf_svx/source/unoedit/svx_unotext2.cxx | 0
binfilter/bf_svx/source/unoedit/svx_unotext2.cxx | 8 ++++----
source/unoedit/unotext2.cxx | 0
svx/source/unoedit/unotext2.cxx | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
Index: openoffice.org-1.9.84.ooo44846.svxcasting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.84.ooo44846.svxcasting.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.84.ooo44846.svxcasting.patch 14 Jun 2005 21:04:01 -0000 1.2
+++ openoffice.org-1.9.84.ooo44846.svxcasting.patch 14 Jul 2005 08:11:08 -0000 1.3
@@ -1,29 +1,29 @@
-Index: source/unoedit/unotext2.cxx
+Index: bf_svx/source/unoedit/svx_unotext2.cxx
===================================================================
-RCS file: /cvs/graphics/svx/source/unoedit/unotext2.cxx,v
-retrieving revision 1.17
-diff -u -p -r1.17 unotext2.cxx
---- openoffice.org.orig/svx/source/unoedit/unotext2.cxx 26 Nov 2004 18:16:55 -0000 1.17
-+++ openoffice.org/svx/source/unoedit/unotext2.cxx 11 Mar 2005 19:06:04 -0000
-@@ -95,7 +95,7 @@ using namespace ::com::sun::star;
+RCS file: /cvs/framework/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx,v
+retrieving revision 1.3
+diff -u -p -r1.3 svx_unotext2.cxx
+--- openoffice.org.orig/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx 3 Aug 2004 16:48:10 -0000 1.3
++++ openoffice.org/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx 13 Jun 2005 09:09:31 -0000
+@@ -109,7 +109,7 @@ using namespace ::com::sun::star;
SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw()
: rText( _rText )
{
- xParentText = (text::XText*)&_rText;
-+ xParentText = const_cast<SvxUnoTextBase*>(&rText);
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
if( rText.GetEditSource() )
pEditSource = rText.GetEditSource()->Clone();
else
-@@ -173,7 +173,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
- aDisposeListeners(aDisposeContainerMutex),
+@@ -171,7 +171,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
+ nParagraph(nPara),
bDisposing( sal_False )
{
- xParentText = (text::XText*)&rText;
-+ xParentText = const_cast<SvxUnoTextBase*>(&rText);
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
}
-@@ -422,7 +422,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
+@@ -418,7 +418,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
// ====================================================================
SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
@@ -32,41 +32,41 @@
rParentText( rText ),
nParagraph( nPara ),
nNextPortion( 0 )
-@@ -513,7 +513,7 @@ uno::Reference< uno::XInterface > SvxUno
+@@ -495,7 +495,7 @@ uno::Reference< uno::XInterface > SvxUno
SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
: SvxUnoTextRangeBase(rText),
- xParentText( (text::XText*)&rText)
-+ xParentText( const_cast<SvxUnoTextBase*>(&rText))
++ xParentText( const_cast<SvxUnoTextBase*>(&rText) )
{
}
-Index: bf_svx/source/unoedit/svx_unotext2.cxx
+Index: source/unoedit/unotext2.cxx
===================================================================
-RCS file: /cvs/framework/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx,v
-retrieving revision 1.3
-diff -u -p -r1.3 svx_unotext2.cxx
---- openoffice.org.orig/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx 3 Aug 2004 16:48:10 -0000 1.3
-+++ openoffice.org/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx 13 Jun 2005 09:09:31 -0000
-@@ -109,7 +109,7 @@ using namespace ::com::sun::star;
+RCS file: /cvs/graphics/svx/source/unoedit/unotext2.cxx,v
+retrieving revision 1.19
+diff -u -p -r1.19 unotext2.cxx
+--- openoffice.org.orig/svx/source/unoedit/unotext2.cxx 28 Jun 2005 15:38:34 -0000 1.19
++++ openoffice.org/svx/source/unoedit/unotext2.cxx 30 Jun 2005 08:41:42 -0000
+@@ -95,7 +95,7 @@ using namespace ::com::sun::star;
SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw()
: rText( _rText )
{
- xParentText = (text::XText*)&_rText;
-+ xParentText = const_cast<SvxUnoTextBase*>(&rText);
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
if( rText.GetEditSource() )
pEditSource = rText.GetEditSource()->Clone();
else
-@@ -171,7 +171,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
- nParagraph(nPara),
+@@ -176,7 +176,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
+ aDisposeListeners(aDisposeContainerMutex),
bDisposing( sal_False )
{
- xParentText = (text::XText*)&rText;
-+ xParentText = const_cast<SvxUnoTextBase*>(&rText);
- SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
+ if( GetEditSource() && GetEditSource()->GetTextForwarder() )
+ SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
}
-
-@@ -418,7 +418,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
+@@ -443,7 +443,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
// ====================================================================
SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
@@ -75,12 +75,12 @@
rParentText( rText ),
nParagraph( nPara ),
nNextPortion( 0 )
-@@ -495,7 +495,7 @@ uno::Reference< uno::XInterface > SvxUno
+@@ -534,7 +534,7 @@ uno::Reference< uno::XInterface > SvxUno
SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
: SvxUnoTextRangeBase(rText),
- xParentText( (text::XText*)&rText)
-+ xParentText( const_cast<SvxUnoTextBase*>(&rText) )
++ xParentText( const_cast<SvxUnoTextBase*>(&rText))
{
}
openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch:
scp2/source/ooo/profileitem_ooo.scp | 4 ++--
source/ooo/profileitem_ooo.scp | 0
2 files changed, 2 insertions(+), 2 deletions(-)
Index: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch 28 Jun 2005 11:28:49 -0000 1.2
+++ openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch 14 Jul 2005 08:11:08 -0000 1.3
@@ -10,10 +10,10 @@
Key = "UserInstallation";
#ifdef WNT
- Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
-+ Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%USERDIR2.0";
++ Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME2.0";
#else
- Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
-+ Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIR2.0";
++ Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME2.0";
#endif
StandaloneValue = "$ORIGIN/..";
End
openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch:
desktop/scripts/soffice.sh | 1 +
officecfg/registry/data/org/openoffice/Office/Common.xcu | 2 +-
registry/data/org/openoffice/Office/Common.xcu | 0
scripts/soffice.sh | 0
4 files changed, 2 insertions(+), 1 deletion(-)
Index: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch 5 Apr 2005 17:11:59 -0000 1.1
+++ openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch 14 Jul 2005 08:11:08 -0000 1.2
@@ -14,3 +14,18 @@
</prop>
</node>
</oor:component-data>
+Index: scripts/soffice.sh
+===================================================================
+RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
+retrieving revision 1.17
+diff -u -p -u -r1.17 soffice.sh
+--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
++++ openoffice.org/desktop/scripts/soffice.sh 11 Jul 2005 14:16:21 -0000
+@@ -64,6 +64,7 @@
+ SAL_ENABLE_FILE_LOCKING=1
+ export SAL_ENABLE_FILE_LOCKING
+
++export SAL_NOEXPANDFPICKER=TRUE
+ # the following test is needed on Linux PPC with IBM j2sdk142
+ if [ `uname -s` = "Linux" -a "`uname -m`" = "ppc" ] ; then
+ JITC_PROCESSOR_TYPE=6
openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch:
officecfg/registry/data/org/openoffice/VCL.xcu | 308 ++++++++++++-------------
registry/data/org/openoffice/VCL.xcu | 0
2 files changed, 154 insertions(+), 154 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
Index: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch 10 Jun 2005 10:26:24 -0000 1.3
+++ openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch 14 Jul 2005 08:11:08 -0000 1.4
@@ -1,14465 +1,682 @@
Index: registry/data/org/openoffice/VCL.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
-retrieving revision 1.39
-diff -u -p -u -r1.39 VCL.xcu
---- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 6 Jun 2005 16:07:01 -0000 1.39
-+++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 8 Jun 2005 15:02:46 -0000
-@@ -60,7191 +60,7271 @@
- *
- ************************************************************************ -->
- <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
--<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-- <node oor:name="Settings">
-- <node oor:name="Accessibility" oor:op="replace">
-- <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
-- <value>false</value>
-- </prop>
-- </node>
-- <node oor:name="Transfer" oor:op="replace">
-- <prop oor:name="SelectionTimeout" oor:type="xs:string" oor:op="replace">
-- <value>3</value>
-- </prop>
-+<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:install="http://openoffice.org/2004/installation"; xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-+ <node oor:name="Settings">
-+ <node oor:name="Accessibility" oor:op="replace">
-+ <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
-+ <value>false</value>
-+ </prop>
-+ </node>
-+ <node oor:name="Transfer" oor:op="replace">
-+ <prop oor:name="SelectionTimeout" oor:type="xs:string" oor:op="replace">
-+ <value>3</value>
-+ </prop>
-+ </node>
-+ </node>
-+ <node oor:name="DefaultFonts">
-+ <node oor:name="en" oor:op="replace">
-+ <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Luxi Sans;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-+ <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Luxi Sans</value>
-+ </prop>
-+ <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;Luxi Sans;SansSerif</value>
-+ </prop>
-+ <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="SYMBOL" oor:type="xs:string" oor:op="replace">
-+ <value>StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol</value>
-+ </prop>
-+ <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-+ </prop>
-+ </node>
-+ <node oor:name="cs" oor:op="replace">
-+ <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-+ </prop>
-+ </node>
-+ <node oor:name="hr-HR" oor:op="replace">
-+ <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-+ <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
-+ </prop>
-+ <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-+ <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
-+ </prop>
-+ </node>
-+ <node oor:name="hu-HU" oor:op="replace">
-+ <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-+ <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
-+ </prop>
-+ <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-+ <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
-+ </prop>
-+ <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
[...14673 lines suppressed...]
--
-- <node oor:name="sansbolditalic" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>albany;arial;helvetica;lucidasans</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Bold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Italic,SansSerif</value>
-- </prop>
-- </node>
--
-- <node oor:name="sanssemibold" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>albany;arial;helvetica;lucidasans</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>SemiBold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Normal,SansSerif</value>
-- </prop>
-- </node>
--
-- <node oor:name="sanssemibolditalic" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>albany;arial;helvetica;lucidasans</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>SemiBold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Italic,SansSerif</value>
-- </prop>
-- </node>
--
-- <node oor:name="sanscondensedsemibold" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>albany;arial;helvetica;lucidasans</value>
-- </prop>
-- <prop oor:name="FontWeight"><value>Semi</value></prop>
-- <prop oor:name="FontWidth"><value>Condensed</value></prop>
-- <prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
-- </node>
--
-- <node oor:name="sanscondensedsemibolditalic" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>albany;arial;helvetica;lucidasans</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>SemiBold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Condensed</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Italic,SansSerif</value>
-- </prop>
-- </node>
--
-- <node oor:name="serifregular" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>thorndale;timesnewroman;times;timesroman;newyork;timmons</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Normal,Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="serifbold" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>thorndale;timesnewroman;times;timesroman;newyork;timmons</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Bold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Normal,Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="serifbolditalic" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>thorndale;timesnewroman;times;timesroman;newyork;timmons</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Bold</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Italic,Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="serifitalic" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>thorndale;timesnewroman;times;timesroman;newyork;timmons</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Italic,Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="serifcaps" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>thorndale;timesnewroman;times;timesroman;newyork;timmons</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Serif,Capitals</value>
-- </prop>
-- </node>
--
-- <node oor:name="charter" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>bitstreamcharter;georgia;timesnewroman</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="bitstreamcharter" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>charter;georgia;timesnewroman</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Serif</value>
-- </prop>
-- </node>
--
-- <node oor:name="georgia" oor:op="replace">
-- <prop oor:name="SubstFonts">
-- <value>bitstreamcharter;charter;timesnewroman</value>
-- </prop>
-- <prop oor:name="FontWeight">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontWidth">
-- <value>Normal</value>
-- </prop>
-- <prop oor:name="FontType">
-- <value>Serif</value>
-- </prop>
-- </node>
--
--
--
-- </node>
-- </node>
- </oor:component-data>
-+
++ <value>ì¬êµ´ë¦¼;SunGulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+ </prop>
+ </node>
+ <node oor:name="dz" oor:op="replace">
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch:
agenda/AgendaTemplate.java | 50 +--
agenda/AgendaTemplate.java.orig |only
agenda/AgendaWizardDialog.java | 20 -
agenda/AgendaWizardDialogImpl.java | 26 -
agenda/CallWizard.java | 4
agenda/TopicsControl.java | 76 ++---
common/ConfigGroup.java | 4
common/ConfigSet.java | 18 -
common/FileAccess.java | 2
common/Helper.java | 12
common/NumberFormatter.java | 4
common/SystemDialog.java | 8
common/UCB.java | 4
db/BlindtextCreator.java | 2
db/ColumnPropertySet.java | 10
db/CommandMetaData.java | 6
db/CommandName.java | 26 -
db/DBMetaData.java | 42 +--
db/FieldColumn.java | 20 -
db/RecordParser.java | 10
db/SQLQueryComposer.java | 12
db/TableDescriptor.java | 34 +-
db/TypeInspector.java | 20 -
document/Control.java | 4
document/DatabaseControl.java | 4
document/FormHandler.java | 2
document/OfficeDocument.java | 4
document/Shape.java | 10
fax/CallWizard.java | 4
fax/FaxWizardDialogImpl.java | 18 -
fax/FaxWizardDialogResources.java | 18 -
form/CallFormWizard.java | 4
form/FieldLinker.java | 10
form/FormConfiguration.java | 2
form/FormControlArranger.java | 36 +-
form/FormDocument.java | 38 +-
form/FormWizard.java | 10
form/StyleApplier.java | 10
form/UIControlArranger.java | 6
letter/CallWizard.java | 4
letter/LetterWizardDialogImpl.java | 32 +-
letter/LetterWizardDialogImpl.java.orig |only
letter/LetterWizardDialogImpl.java.rej |only
letter/LetterWizardDialogResources.java | 18 -
letter/LetterWizardDialogResources.java.orig |only
letter/LetterWizardDialogResources.java.rej |only
query/CallQueryWizard.java | 4
query/Finalizer.java | 4
query/QuerySummary.java | 20 -
query/QueryWizard.java | 10
report/CallReportWizard.java | 4
report/DBColumn.java | 18 -
report/Dataimport.java | 4
report/Finalizer.java | 2
report/GroupFieldHandler.java | 2
report/RecordTable.java | 2
report/ReportDocument.java | 24 -
report/ReportLayouter.java | 2
report/ReportWizard.java | 12
table/CGCategory.java | 4
table/CGTable.java | 4
table/CallTableWizard.java | 4
table/FieldDescription.java | 22 -
table/FieldFormatter.java | 2
table/PrimaryKeyHandler.java | 10
table/ScenarioSelector.java | 6
table/TableWizard.java | 8
text/TextFieldHandler.java | 4
text/TextFieldHandler.java.orig |only
text/TextSectionHandler.java | 6
text/TextStyleHandler.java | 4
text/TextTableHandler.java | 6
text/ViewHandler.java | 10
tutorial/creator/frame/CallTutorialCreatorFramework.java | 4
tutorial/creator/frame/ConnectFrame.java | 34 +-
tutorial/creator/frame/Framework.java | 6
tutorial/creator/frame/StepFrame.java | 78 ++---
tutorial/creator/frame/StepModel.java | 2
tutorial/creator/frame/TutorialCreator.java | 34 +-
tutorial/creator/frame/objectFinder/AccessibleObjectFind.java | 6
tutorial/creator/frame/objectFinder/ActionFrame.java | 28 +-
tutorial/creator/frame/objectFinder/ActionPanel.java | 14 -
tutorial/creator/frame/objectFinder/GraphicalDisplay.java | 10
tutorial/creator/frame/objectFinder/MenuFactory.java | 18 -
tutorial/creator/frame/objectFinder/MethodDialog.java | 26 -
tutorial/creator/frame/objectFinder/TableColumModel.java | 2
tutorial/creator/frame/objectFinder/TextualDisplay.java | 14 -
tutorial/executer/CallTutorialFramework.java | 12
tutorial/executer/ExecuteCache.java | 18 -
tutorial/executer/ExecuteMethod.java | 16 -
tutorial/executer/ExecutePropertiesMethod.java | 10
tutorial/executer/LocalisationCache.java | 2
tutorial/executer/TranslateMacro.java | 16 -
tutorial/executer/officeHelper/Components.java | 26 -
tutorial/executer/officeHelper/Desktop.java | 22 -
tutorial/executer/officeHelper/DesktopDialog.java | 4
tutorial/executer/officeHelper/DesktopMenu.java | 4
tutorial/executer/officeHelper/Presentation_Drawing.java | 4
tutorial/executer/officeHelper/Spreadsheet.java | 18 -
tutorial/executer/officeHelper/TextDocument.java | 4
tutorial/executer/officeHelper/XCellTextCompact.java | 4
tutorial/executer/officeHelper/XItemSelection.java | 4
tutorial/executer/officeHelper/XMouse.java | 4
tutorial/executer/officeHelper/XMoveMouseCompact.java | 4
tutorial/executer/officeHelper/XTabList.java | 4
tutorial/executer/officeHelper/XTextCompact.java | 4
tutorial/executer/util/AccessibilityTools.java | 42 +--
tutorial/executer/util/Child.java | 4
tutorial/executer/util/Control.java | 36 +-
tutorial/executer/util/File.java | 2
tutorial/executer/util/FindInterfaces.java | 8
tutorial/executer/util/Helper.java | 8
tutorial/executer/util/Localizer.java | 4
tutorial/executer/util/NameProvider.java | 4
tutorial/executer/util/PathProperties.java | 6
tutorial/executer/util/PropertiesFileWriter.java | 2
ui/AggregateComponent.java | 50 +--
ui/CommandFieldSelection.java | 10
ui/ControlScroller.java | 110 +++----
ui/DBLimitedFieldSelection.java | 46 +--
ui/DocumentPreview.java | 20 -
ui/FieldSelection.java | 14 -
ui/FilterComponent.java | 56 ++--
ui/ImageList.java | 138 +++++-----
ui/ImageList.java.orig |only
ui/PathSelection.java | 4
ui/SortingComponent.java | 10
ui/TitlesComponent.java | 18 -
ui/UnoDialog.java | 8
ui/UnoDialog.java.orig |only
ui/UnoDialog2.java | 6
ui/UnoDialog2.java.orig |only
ui/WizardDialog.java | 50 +--
ui/event/AbstractListener.java | 2
ui/event/DataAware.java | 32 +-
ui/event/DataAwareFields.java | 34 +-
ui/event/ListModelBinder.java | 22 -
ui/event/RadioDataAware.java | 6
ui/event/SimpleDataAware.java | 14 -
ui/event/Task.java | 22 -
ui/event/TaskEvent.java | 2
ui/event/UnoDataAware.java | 24 -
web/AbstractErrorHandler.java | 12
web/BackgroundsDialog.java | 22 -
web/CallWizard.java | 6
web/CallWizard.java.orig |only
web/ExtensionVerifier.java | 2
web/FTPDialog.java | 96 +++---
web/IconsDialog.java | 16 -
web/ImageListDialog.java | 56 ++--
web/LogTaskListener.java | 2
web/Process.java | 60 ++--
web/ProcessErrorHandler.java | 8
web/StatusDialog.java | 30 +-
web/StylePreview.java | 12
web/TOCPreview.java | 20 -
web/WWD_Events.java | 38 +-
web/WWD_General.java | 50 +--
web/WWD_Startup.java | 70 ++---
web/WWD_Startup.java.orig |only
web/WebWizardDialog.java | 24 -
web/data/CGContent.java | 2
web/data/CGDesign.java | 10
web/data/CGDocument.java | 22 -
web/data/CGGeneralInfo.java | 2
web/data/CGLayout.java | 4
web/data/CGPublish.java | 2
web/data/CGSession.java | 2
web/data/CGSettings.java | 18 -
web/export/AbstractExporter.java | 22 -
web/export/ConfiguredExporter.java | 2
web/export/FilterExporter.java | 4
web/export/ImpressHTMLExporter.java | 12
web/status/ErrorLog.java | 2
web/status/LogTaskListener.java | 2
web/status/Task.java | 20 -
web/status/TaskEvent.java | 2
177 files changed, 1382 insertions(+), 1382 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
Index: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch 31 May 2005 11:09:24 -0000 1.4
+++ openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch 14 Jul 2005 08:11:08 -0000 1.5
@@ -1,11 +1,7 @@
-Index: com/sun/star/wizards/agenda/AgendaTemplate.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java,v
-retrieving revision 1.4
-diff -u -p -r1.4 AgendaTemplate.java
---- openoffice.org.orig/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 21 Feb 2005 13:50:05 -0000 1.4
-+++ openoffice.org/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 31 May 2005 09:53:47 -0000
-@@ -231,7 +231,7 @@ public class AgendaTemplate extends Text
+diff -ru SRC680_m116/wizards.orig/com/sun/star/wizards/agenda/AgendaTemplate.java SRC680_m116/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+--- SRC680_m116/wizards.orig/com/sun/star/wizards/agenda/AgendaTemplate.java 2005-07-13 09:33:12.000000000 -0400
++++ SRC680_m116/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 2005-07-13 09:33:30.000000000 -0400
+@@ -232,7 +232,7 @@
/**
* used to set the document title property (step 6).
*/
@@ -14,7 +10,7 @@
/**
* loads the given template, and analyze its structure.
-@@ -259,7 +259,7 @@ public class AgendaTemplate extends Text
+@@ -260,7 +260,7 @@
* @param url
* @return the template name without the "aw-" at the beginning.
*/
@@ -23,7 +19,7 @@
return FileAccess.connectURLs( FileAccess.getParentDir(url) ,FileAccess.getFilename(url).substring(3));
}
-@@ -271,7 +271,7 @@ public class AgendaTemplate extends Text
+@@ -272,7 +272,7 @@
* information (it is only actualized on save) the given list
* supplies this information.
*/
@@ -32,7 +28,7 @@
for (int i = 0; i < itemsTables.length; i++) {
try {
itemsTables[i].write("");
-@@ -377,7 +377,7 @@ public class AgendaTemplate extends Text
+@@ -378,7 +378,7 @@
* A cache is used in order to reuse the objects, instead of recreate them.
* This method fills the cache will all items objects (names and headings).
*/
@@ -41,7 +37,7 @@
itemsCache = new Hashtable(11);
XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document);
-@@ -443,7 +443,7 @@ public class AgendaTemplate extends Text
+@@ -444,7 +444,7 @@
* -locate the titles and actualize them
* -analyze the topics table
*/
@@ -50,7 +46,7 @@
{
/*
* Get the default locale of the document, and create the date and time formatters.
-@@ -498,7 +498,7 @@ public class AgendaTemplate extends Text
+@@ -499,7 +499,7 @@
* locates the titles (name, location, date, time) and saves a reference to thier Text ranges.
*
*/
@@ -59,7 +55,7 @@
XTextRange item = null;
XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document);
-@@ -530,12 +530,12 @@ public class AgendaTemplate extends Text
+@@ -531,12 +531,12 @@
}
}
@@ -74,7 +70,7 @@
{
_allItems = searchFillInItems();
}
-@@ -544,7 +544,7 @@ public class AgendaTemplate extends Text
+@@ -545,7 +545,7 @@
* searches the document for items in the format ">*<"
* @return a vector containing the XTextRanges of the found items
*/
@@ -83,7 +79,7 @@
try {
XSearchable xSearchable = (XSearchable)UnoRuntime.queryInterface(XSearchable.class,document);
XSearchDescriptor sd = xSearchable.createSearchDescriptor();
-@@ -574,7 +574,7 @@ public class AgendaTemplate extends Text
+@@ -575,7 +575,7 @@
* analyze the item sections in the template. delegates the analyze of each table to the
* ItemsTable class.
*/
@@ -92,7 +88,7 @@
{
String[] sections = getSections(document, TemplateConsts.SECTION_ITEMS);
-@@ -593,7 +593,7 @@ public class AgendaTemplate extends Text
+@@ -594,7 +594,7 @@
}
@@ -101,7 +97,7 @@
{
XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document);
String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames();
-@@ -627,7 +627,7 @@ public class AgendaTemplate extends Text
+@@ -628,7 +628,7 @@
}
@@ -110,7 +106,7 @@
if (controlName.equals("txtTitle"))
writeTitle(teTitle, trTitle, agenda.cp_Title);
else if (controlName.equals("txtDate"))
-@@ -640,13 +640,13 @@ public class AgendaTemplate extends Text
+@@ -641,13 +641,13 @@
}
@@ -127,7 +123,7 @@
if (d == null || d.equals(""))
return "";
-@@ -666,7 +666,7 @@ public class AgendaTemplate extends Text
+@@ -667,7 +667,7 @@
return dateFormatter.convertNumberToString(dateFormat, daysDiff);
}
@@ -136,7 +132,7 @@
if (s == null || s.equals(""))
return "";
int time = new Integer(s).intValue();
-@@ -692,7 +692,7 @@ public class AgendaTemplate extends Text
+@@ -693,7 +693,7 @@
* user specified not to display any items which it contains.
* When finishing the wizard removes this sections entireley from the document.
*/
@@ -145,7 +141,7 @@
XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document);
String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames();
try {
-@@ -824,7 +824,7 @@ public class AgendaTemplate extends Text
+@@ -825,7 +825,7 @@
* @param text the text to fill to the text range object.
* @param placeholder the placeholder text to use, if the text argument is empty (null or "")
*/
@@ -154,7 +150,7 @@
String paraStyle = (String)Helper.getUnoPropertyValue(range,"ParaStyleName");
range.setString((String)text);
Helper.setUnoPropertyValue(range,"ParaStyleName",paraStyle);
-@@ -1226,7 +1226,7 @@ public class AgendaTemplate extends Text
+@@ -1227,7 +1227,7 @@
* @return the number of rows that have been added
* to the table. 0 or a negative number: no rows added.
*/
@@ -163,7 +159,7 @@
while (topic >= writtenTopics.size())
writtenTopics.add(null);
-@@ -1270,7 +1270,7 @@ public class AgendaTemplate extends Text
+@@ -1271,7 +1271,7 @@
* (false would mean new rows must be added to the table in order to
* be able to write this topic).
*/
@@ -172,7 +168,7 @@
return (writtenTopics.size() > topic && writtenTopics.get(topic) != null );
}
-@@ -1406,7 +1406,7 @@ public class AgendaTemplate extends Text
+@@ -1407,7 +1407,7 @@
/**
* reapply the format of the first (header) row.
*/
@@ -181,7 +177,7 @@
XTextTableCursor cursor = table.createCursorByCellName("A1");
formatTable(cursor,firstRowFormat, false );
}
-@@ -1414,7 +1414,7 @@ public class AgendaTemplate extends Text
+@@ -1415,7 +1415,7 @@
/**
* reaply the format of the last row.
*/
@@ -190,7 +186,7 @@
XTextTableCursor cursor = table.createCursorByCellName("A1");
cursor.gotoEnd(false);
formatTable(cursor,lastRowFormat, true);
-@@ -1428,7 +1428,7 @@ public class AgendaTemplate extends Text
+@@ -1429,7 +1429,7 @@
* @return a TextElement object which will write the given value
* to the given cell.
*/
@@ -199,7 +195,7 @@
if (cell >= 0) {
TextElement te = ((TextElement)topicCells.get(cell));
if (te != null)
-@@ -1448,7 +1448,7 @@ public class AgendaTemplate extends Text
[...12199 lines suppressed...]
-+ public int max = 0;
-+ public String taskName;
-+ public List listeners = new Vector();
-+ public String subtaskName;
-
-
- public Task(String taskName_ , String subtaskName_, int max_) {
-@@ -71,28 +71,28 @@ public class Task {
- listeners.remove(tl);
+- private XFrame getFrame(Object model) {
++ public XFrame getFrame(Object model) {
+ XModel xmodel = (XModel)UnoRuntime.queryInterface(XModel.class,model);
+ return xmodel.getCurrentController().getFrame();
+ }
+@@ -456,7 +456,7 @@
+ /**
+ * initializes the style preview.
+ */
+- private void addStylePreview() {
++ public void addStylePreview() {
+ try {
+ dpStylePreview = new DocumentPreview(xMSF, imgPreview);
+ stylePreview = new StylePreview(xMSF, settings.workPath);
+@@ -471,7 +471,7 @@
+ /**
+ * Loads the web wizard settings from the registry.
+ */
+- private void loadSettings(Object document) {
++ public void loadSettings(Object document) {
+ try {
+ // instanciate
+ String[] settingsResources = new String[] {
+@@ -520,7 +520,7 @@
}
-
-- protected void fireTaskStatusChanged() {
-+ public void fireTaskStatusChanged() {
- TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STATUS_CHANGED);
-
- for (int i = 0; i<listeners.size(); i++)
- ((TaskListener)listeners.get(i)).taskStatusChanged(te);
+
+
+- protected void prepareSessionLists() {
++ public void prepareSessionLists() {
+ // now copy the sessions list...
+ Object[] sessions = settings.cp_SavedSessions.items();
+ settings.savedSessions.clear();
+@@ -539,7 +539,7 @@
+ * Also set the selected "load" session to the last session
+ * which was saved.
+ */
+- private void fillLists() {
++ public void fillLists() {
+ // fill the saved session list.
+ ListModelBinder.fillList(lstLoadSettings, settings.cp_SavedSessions.items(), null);
+
+@@ -555,7 +555,7 @@
+
}
-
-- protected void fireTaskStarted() {
-+ public void fireTaskStarted() {
- TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STARTED);
+
+- protected void selectSession() {
++ public void selectSession() {
+ int selectedSession = 0;
+ if (settings.cp_LastSavedSession != null && !settings.cp_LastSavedSession.equals("")) {
+
+@@ -572,7 +572,7 @@
+ * textbox, no buttons though), a DataObject's JavaBean Property,
+ * or class member.
+ */
+- private void makeDataAware() {
++ public void makeDataAware() {
+ //page 1
+ new ListModelBinder(lstLoadSettings, settings.cp_SavedSessions);
- for (int i = 0; i<listeners.size(); i++)
- ((TaskListener)listeners.get(i)).taskStarted(te);
+@@ -657,7 +657,7 @@
+ * @param checkbox
+ * @param textbox
+ */
+- private void pubAware(String publish, Object checkbox, Object textbox, boolean isLabel) {
++ public void pubAware(String publish, Object checkbox, Object textbox, boolean isLabel) {
+ Object p = settings.cp_DefaultSession.cp_Publishing.getElement(publish);
+ UnoDataAware uda = UnoDataAware.attachCheckBox(p, "cp_Publish", checkbox, checkPublish, true);
+ uda.setInverse(true);
+@@ -687,7 +687,7 @@
+ * and ??? times for each document in the session.
+ *
+ */
+- protected void mount(CGSession session, Task task, boolean refreshStyle, XControl xC ) {
++ public void mount(CGSession session, Task task, boolean refreshStyle, XControl xC ) {
+ /* This checks the documents. If the user
+ * chooses to cancel, the session is not loaded.
+ */
+@@ -734,7 +734,7 @@
+ * @param data the CGPublish object
+ * @param i the number of the object (0 = local, 1 = ftp, 2 = zip)
+ */
+- private void mount(Object data, int i) {
++ public void mount(Object data, int i) {
+ ((DataAware) pubAware.get(i * 2)).setDataObject(data, true);
+ ((DataAware) pubAware.get(i * 2 + 1)).setDataObject(data, true);
}
-
-- protected void fireTaskFinished() {
-+ public void fireTaskFinished() {
- TaskEvent te = new TaskEvent(this, TaskEvent.TASK_FINISHED);
-
- for (int i = 0; i<listeners.size(); i++)
- ((TaskListener)listeners.get(i)).taskFinished(te);
+@@ -744,7 +744,7 @@
+ * @param root the CGContent object
+ * that contains the documents (a ListModel)
+ */
+- private void mount(CGContent root) {
++ public void mount(CGContent root) {
+ ListModelBinder.fillList(lstDocuments, root.cp_Documents.items(), null);
+ docsBinder.setListModel(root.cp_Documents);
+ disableDocUpDown();
+@@ -757,7 +757,7 @@
+ * @param data
+ * @param list
+ */
+- protected void mount(Object data, List list) {
++ public void mount(Object data, List list) {
+ for (int i = 0; i < list.size(); i++)
+ ((DataAware) list.get(i)).setDataObject(data, true);
+ }
+@@ -773,7 +773,7 @@
+ * displayed, using the Task object to monitor progress.
+ * @return true if the document is ok (a file exists in the given url).
+ */
+- protected boolean checkDocument(CGDocument doc, Task task, XControl xC) {
++ public boolean checkDocument(CGDocument doc, Task task, XControl xC) {
+ try {
+ doc.validate(xMSF, task);
+ return true;
+@@ -819,7 +819,7 @@
+ * @param content
+ * @param task
+ */
+- private void checkContent(CGContent content, Task task, XControl xC) {
++ public void checkContent(CGContent content, Task task, XControl xC) {
+ for (int i = 0; i < content.cp_Documents.getSize(); i++)
+ if (!checkDocument((CGDocument) content.cp_Documents.getElementAt(i), task, xC))
+ // I use here 'i--' since, when the document is removed
+@@ -835,7 +835,7 @@
+ * changes the "create" button enable state accordingly.
+ * @author rpiterman
+ */
+- private class CheckPublish implements DataAware.Listener {
++ public class CheckPublish implements DataAware.Listener {
+ public void eventPerformed(Object event) {
+ checkPublish();
+ }
+@@ -848,7 +848,7 @@
+ * down disabled and so on...)
+ *
+ */
+- protected void disableDocUpDown() {
++ public void disableDocUpDown() {
+ try {
+ setEnabled(btnDocUp, selectedDoc.length == 0 ? Boolean.FALSE : (selectedDoc[0] == 0 ? Boolean.FALSE : Boolean.TRUE));
+ setEnabled(btnDocDown, selectedDoc.length == 0 ? Boolean.FALSE : (selectedDoc[0] + 1 < settings.cp_DefaultSession.cp_Content.cp_Documents.getSize() ? Boolean.TRUE : Boolean.FALSE));
+@@ -900,7 +900,7 @@
}
-- protected void fireSubtaskNameChanged() {
-+ public void fireSubtaskNameChanged() {
- TaskEvent te = new TaskEvent(this, TaskEvent.SUBTASK_NAME_CHANGED);
-
- for (int i = 0; i<listeners.size(); i++)
-Index: com/sun/star/wizards/web/status/TaskEvent.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/status/TaskEvent.java,v
-retrieving revision 1.2
-diff -u -p -r1.2 TaskEvent.java
---- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/TaskEvent.java 19 May 2004 13:22:01 -0000 1.2
-+++ openoffice.org/wizards/com/sun/star/wizards/web/status/TaskEvent.java 31 May 2005 09:54:25 -0000
-@@ -21,7 +21,7 @@ public class TaskEvent extends EventObje
- public static final int TASK_STATUS_CHANGED = 3;
- public static final int SUBTASK_NAME_CHANGED = 4;
-
-- private int type;
-+ public int type;
-
- /**
- * general constructor-
+
+- private class StylesComparator implements Comparator {
++ public class StylesComparator implements Comparator {
+
+ /* (non-Javadoc)
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+Only in SRC680_m116/wizards/com/sun/star/wizards/web: WWD_Startup.java.orig
workspace.gslpatches2.patch:
gcach_layout.cxx | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
Index: workspace.gslpatches2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/workspace.gslpatches2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.gslpatches2.patch 14 Jun 2005 21:04:01 -0000 1.1
+++ workspace.gslpatches2.patch 14 Jul 2005 08:11:08 -0000 1.2
@@ -28,92 +28,3 @@
}
// -----------------------------------------------------------------------
-Index: unx/gtk/window/gtkframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
-retrieving revision 1.30
-retrieving revision 1.30.12.3
-diff -u -p -r1.30 -r1.30.12.3
---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 18 May 2005 08:04:16 -0000 1.30
-+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2 Jun 2005 09:34:43 -0000 1.30.12.3
-@@ -355,6 +355,7 @@ void GtkSalFrame::hardIMReset()
- #endif
- m_bWasPreedit = false;
- CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
-+ updateIMSpotLocation();
- }
- }
-
-@@ -2270,12 +2271,10 @@ gboolean GtkSalFrame::signalKey( GtkWidg
- {
- pThis->m_bSendModChangeOnRelease = false;
- pThis->m_bSingleAltPress = false;
-+ pThis->updateIMSpotLocation();
- }
- }
-
-- if( !aDel.isDeleted() )
-- pThis->updateIMSpotLocation();
--
- return TRUE;
- }
-
-@@ -2410,6 +2409,7 @@ void GtkSalFrame::signalIMCommit( GtkIMC
- #endif
- pThis->m_bWasPreedit = false;
- pThis->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
-+ pThis->updateIMSpotLocation();
- return;
- }
- }
-@@ -2421,7 +2421,11 @@ void GtkSalFrame::signalIMCommit( GtkIMC
- pThis->m_bWasPreedit = false;
- pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
- if( ! aDel.isDeleted() )
-+ {
- pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+ if( ! aDel.isDeleted() )
-+ pThis->updateIMSpotLocation();
-+ }
- }
-
- void GtkSalFrame::signalIMPreeditChanged( GtkIMContext* pContext, gpointer frame )
-@@ -2441,7 +2445,7 @@ void GtkSalFrame::signalIMPreeditChanged
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, ":signalImPreeditChanged '%s'\n", pText );
- #endif
-- bool bEndPreedit = (!pText || !*pText) && pThis->m_bWasPreedit;
-+ bool bEndPreedit = (!pText || !*pText);
-
- SalExtTextInputEvent aTextEvent;
-
-@@ -2511,13 +2515,17 @@ void GtkSalFrame::signalIMPreeditChanged
-
- vcl::DeletionListener aDel( pThis );
-
-- pThis->m_bWasPreedit = true;
-+ if (!bEndPreedit)
-+ pThis->m_bWasPreedit = true;
-+
- pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
-
- delete [] pSalAttribs;
-
- if( bEndPreedit && ! aDel.isDeleted() )
- pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+ if( ! aDel.isDeleted() )
-+ pThis->updateIMSpotLocation();
- }
-
- void GtkSalFrame::signalIMPreeditStart( GtkIMContext* pContext, gpointer frame )
-@@ -2540,7 +2548,10 @@ void GtkSalFrame::signalIMPreeditEnd( Gt
- fprintf( stderr, ":signalImPreeditEnd\n" );
- #endif
- GTK_YIELD_GRAB();
-+ vcl::DeletionListener aDel( pThis );
- pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
-+ if( ! aDel.isDeleted() )
-+ pThis->updateIMSpotLocation();
- }
- }
-
workspace.vcl39.patch:
padmin/source/fontentry.cxx | 6
psprint/inc/psprint/fontmanager.hxx | 2
psprint/source/fontmanager/fontcache.cxx | 40 --
psprint/source/fontmanager/fontconfig.cxx | 7
psprint/source/fontmanager/fontmanager.cxx | 17 -
psprint/source/fontsubset/sft.c | 8
psprint/source/fontsubset/sft.h | 2
toolkit/source/awt/vclxtoolkit.cxx | 5
vcl/inc/salframe.hxx | 2
vcl/inc/sallayout.hxx | 10
vcl/inc/scrbar.hxx | 1
vcl/inc/window.hxx | 2
vcl/source/app/stdtext.cxx | 5
vcl/source/app/svapp.cxx | 5
vcl/source/app/svdata.cxx | 41 +-
vcl/source/control/button.cxx | 52 ++-
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 29 -
vcl/source/control/scrbar.cxx | 88 +++--
vcl/source/gdi/bmpfast.cxx | 34 +-
vcl/source/gdi/sallayout.cxx | 49 ++
vcl/source/window/brdwin.cxx | 7
vcl/source/window/menu.cxx | 63 ++-
vcl/source/window/msgbox.cxx | 23 +
vcl/source/window/scrwnd.cxx | 11
vcl/source/window/splitwin.cxx | 15
vcl/source/window/window.cxx | 5
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 33 -
vcl/unx/gtk/window/gtkframe.cxx | 92 +++--
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1
vcl/unx/inc/salframe.h | 1
vcl/unx/inc/wmadaptor.hxx | 21 +
vcl/unx/source/app/soicon.cxx | 3
vcl/unx/source/app/wmadaptor.cxx | 179 +++++++---
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/xfont.cxx | 5
vcl/unx/source/window/salframe.cxx | 37 ++
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 274 ++++++++++++----
vcl/win/source/gdi/winlayout.cxx | 492 ++++++++++++++++++-----------
vcl/win/source/window/salframe.cxx | 15
42 files changed, 1157 insertions(+), 536 deletions(-)
Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/workspace.vcl39.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl39.patch 10 Jun 2005 10:26:24 -0000 1.1
+++ workspace.vcl39.patch 14 Jul 2005 08:11:08 -0000 1.2
@@ -940,57 +940,6 @@
return false;
}
-Index: source/gdi/metric.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/metric.cxx,v
-retrieving revision 1.14
-retrieving revision 1.14.12.1
-diff -u -p -u -r1.14 -r1.14.12.1
---- openoffice.org.orig/vcl/source/gdi/metric.cxx 29 Mar 2005 11:45:44 -0000 1.14
-+++ openoffice.org/vcl/source/gdi/metric.cxx 23 May 2005 12:54:39 -0000 1.14.12.1
-@@ -643,7 +643,9 @@ bool ParseCMAP( const unsigned char* pCm
- rResult.mnPairCount = 2;
- return true;
- }
--
-+
-+ delete[] pCodePairs;
-+ delete[] pStartGlyphs;
- return false;
- }
-
-@@ -731,6 +733,7 @@ bool ParseCMAP( const unsigned char* pCm
- *(pCP++) = *itInt;
-
- // glyph mapping for non-unicode fonts not implemented
-+ delete[] pStartGlyphs;
- pStartGlyphs = NULL;
- }
-
-Index: source/gdi/print.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
-retrieving revision 1.47
-retrieving revision 1.47.2.1
-diff -u -p -u -r1.47 -r1.47.2.1
---- openoffice.org.orig/vcl/source/gdi/print.cxx 12 Apr 2005 12:19:33 -0000 1.47
-+++ openoffice.org/vcl/source/gdi/print.cxx 1 Jun 2005 08:10:20 -0000 1.47.2.1
-@@ -724,6 +724,7 @@ Printer::~Printer()
- {
- // OutputDevice-Dtor versucht das gleiche, deshalb muss hier
- // der FontEntry auch auf NULL gesetzt werden
-+ // TODO: consolidate duplicate cleanup by Printer and OutputDevice
- if ( mpFontEntry )
- {
- mpFontCache->Release( mpFontEntry );
-@@ -740,6 +741,7 @@ Printer::~Printer()
- mpGetDevSizeList = NULL;
- }
- delete mpFontCache;
-+ mpFontCache = NULL;
- // font list deleted by OutputDevice dtor
- }
-
Index: source/gdi/sallayout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v
@@ -1351,42 +1300,6 @@
SalFrame* pParentFrame = NULL;
if ( pParent )
-Index: unx/gtk/app/gtkdata.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkdata.cxx,v
-retrieving revision 1.17
-retrieving revision 1.17.14.1
-diff -u -p -u -r1.17 -r1.17.14.1
---- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx 22 Apr 2005 11:32:22 -0000 1.17
-+++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx 10 May 2005 17:01:13 -0000 1.17.14.1
-@@ -687,18 +687,18 @@ void GtkXLib::Yield( BOOL bWait )
- */
-
- bool bDispatchThread = false;
-- if( osl_tryToAcquireMutex( m_aDispatchMutex ) )
-- {
-- // we are the dispatch thread
-- osl_resetCondition( m_aDispatchCondition );
-- bDispatchThread = true;
-- }
-- else if( ! bWait )
-- return; // someone else is waiting already, return
--
- {
- // release YieldMutex (and re-acquire at block end)
- YieldMutexReleaser aReleaser;
-+ if( osl_tryToAcquireMutex( m_aDispatchMutex ) )
-+ {
-+ // we are the dispatch thread
-+ osl_resetCondition( m_aDispatchCondition );
-+ bDispatchThread = true;
-+ }
-+ else if( ! bWait )
-+ return; // someone else is waiting already, return
-+
-
- if( bDispatchThread )
- g_main_context_iteration( NULL, bWait );
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
@@ -1705,32 +1618,6 @@
bool m_bFullscreen;
bool m_bSingleAltPress;
bool m_bDefaultPos;
-Index: unx/source/app/sm.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/sm.cxx,v
-retrieving revision 1.22
-retrieving revision 1.21.18.2
-diff -u -p -u -r1.22 -r1.21.18.2
---- openoffice.org.orig/vcl/unx/source/app/sm.cxx 31 May 2005 17:05:13 -0000 1.22
-+++ openoffice.org/vcl/unx/source/app/sm.cxx 6 Jun 2005 08:18:24 -0000 1.21.18.2
-@@ -355,6 +355,17 @@ void SessionManagerClient::SaveYourselfP
- BuildSmPropertyList();
- #ifdef USE_SM_EXTENSION
- bDocSaveDone = false;
-+ /* #i49875# some session managers send a "die" message if the
-+ * saveDone does not come early enough for their convenience
-+ * this can occasionally happen on startup, especially the first
-+ * startup. So shortcut the "not shutting down" case since the
-+ * upper layers are currently not interested in that event anyway.
-+ */
-+ if( ! shutdown )
-+ {
-+ SessionManagerClient::saveDone();
-+ return;
-+ }
- Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
- SMprintf( "waiting for save yourself event to be processed\n" );
- #endif
Index: unx/source/app/soicon.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/soicon.cxx,v
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]