Tag: cws_src680_gcc41 User: pmladek Date: 06/01/05 05:03:01 Modified: /dba/connectivity/source/drivers/mozab/bootstrap/ MNSFolders.cxx /util/configmgr/source/inc/ nodeaddress.hxx /sw/sw/source/core/inc/ flowfrm.hxx /sw/sw/source/core/swg/ SwXMLTextBlocks1.cxx /gsl/vcl/inc/ outdev.hxx, window.hxx /util/tools/inc/ fsys.hxx /graphics/goodies/source/filter.vcl/eos2met/ eos2met.cxx
Log: #i58972# Some more fixes for gcc-4.1 by Stephan Bergmann <[EMAIL PROTECTED]> File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSFolders.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx?r1=1.3&r2=1.3.52.1 Delta lines: +7 -7 ------------------- --- MNSFolders.cxx 8 Sep 2005 06:22:59 -0000 1.3 +++ MNSFolders.cxx 5 Jan 2006 13:02:53 -0000 1.3.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: MNSFolders.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.52.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:22:59 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,9 +55,9 @@ "Mozilla\\Firefox\\", "Thunderbird\\" #else - ".mozilla\/", - ".mozilla\/firefox\/", - ".thunderbird\/" + ".mozilla/", + ".mozilla/firefox/", + ".thunderbird/" #endif }; #if defined(XP_MAC) || defined(XP_MACOSX) @@ -77,7 +77,7 @@ return ::rtl::OString(szPath) + ::rtl::OString("\\"); #elif defined(UNIX) const char* homeDir = getenv("HOME"); - return ::rtl::OString(homeDir) + ::rtl::OString("\/"); + return ::rtl::OString(homeDir) + ::rtl::OString("/"); #endif } Directory: /util/configmgr/source/inc/ ====================================== File [changed]: nodeaddress.hxx Url: http://util.openoffice.org/source/browse/util/configmgr/source/inc/nodeaddress.hxx?r1=1.4&r2=1.4.22.1 Delta lines: +11 -7 -------------------- --- nodeaddress.hxx 8 Sep 2005 03:51:21 -0000 1.4 +++ nodeaddress.hxx 5 Jan 2006 13:02:54 -0000 1.4.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: nodeaddress.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 03:51:21 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,15 +73,19 @@ AddressType::RawAddress addressValue() const { return m_pData.value(); } - friend bool operator == (NodeAddress const& lhs, NodeAddress const& rhs) - { return lhs.m_pData == rhs.m_pData; } + friend bool operator == (NodeAddress const& lhs, NodeAddress const& rhs); - friend bool operator != (NodeAddress const& lhs, NodeAddress const& rhs) - { return lhs.m_pData != rhs.m_pData; } + friend bool operator != (NodeAddress const& lhs, NodeAddress const& rhs); private: AddressType m_pData; }; + + inline bool operator == (NodeAddress const& lhs, NodeAddress const& rhs) + { return lhs.m_pData == rhs.m_pData; } + + inline bool operator != (NodeAddress const& lhs, NodeAddress const& rhs) + { return lhs.m_pData != rhs.m_pData; } // ------------------------------------------------------------------------- class ValueNodeAddress Directory: /sw/sw/source/core/inc/ ================================== File [changed]: flowfrm.hxx Url: http://sw.openoffice.org/source/browse/sw/sw/source/core/inc/flowfrm.hxx?r1=1.9&r2=1.9.152.1 Delta lines: +5 -3 ------------------- --- flowfrm.hxx 9 Sep 2005 03:46:33 -0000 1.9 +++ flowfrm.hxx 5 Jan 2006 13:02:55 -0000 1.9.152.1 @@ -4,9 +4,9 @@ * * $RCSfile: flowfrm.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.152.1 $ * - * last change: $Author: rt $ $Date: 2005/09/09 03:46:33 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,8 @@ // --> OD 2005-03-04 #i44049# class SwObjectFormatterTxtFrm; // <-- + +void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & ); class SwFlowFrm { Directory: /sw/sw/source/core/swg/ ================================== File [changed]: SwXMLTextBlocks1.cxx Url: http://sw.openoffice.org/source/browse/sw/sw/source/core/swg/SwXMLTextBlocks1.cxx?r1=1.11&r2=1.11.150.1 Delta lines: +3 -15 -------------------- --- SwXMLTextBlocks1.cxx 9 Sep 2005 04:43:40 -0000 1.11 +++ SwXMLTextBlocks1.cxx 5 Jan 2006 13:02:55 -0000 1.11.150.1 @@ -4,9 +4,9 @@ * * $RCSfile: SwXMLTextBlocks1.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.150.1 $ * - * last change: $Author: rt $ $Date: 2005/09/09 04:43:40 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -136,11 +136,7 @@ } else { -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) String aStreamName = aFolderName + (OUString) String::CreateFromAscii(".xml"); -#else - String aStreamName = aFolderName + String::CreateFromAscii(".xml"); -#endif try { xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ ); @@ -357,11 +353,7 @@ sal_Bool bTextOnly = sal_True; String aFolderName; GeneratePackageName ( rShort, aFolderName ); -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) String aStreamName = aFolderName + (OUString) String::CreateFromAscii(".xml"); -#else - String aStreamName = aFolderName + String::CreateFromAscii(".xml"); -#endif rText.Erase(); try @@ -446,11 +438,7 @@ } */ String aFolderName( rPackageName ); -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) String aStreamName = aFolderName + (OUString) String::CreateFromAscii(".xml"); -#else - String aStreamName = aFolderName + String::CreateFromAscii(".xml"); -#endif Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); Directory: /gsl/vcl/inc/ ======================== File [changed]: outdev.hxx Url: http://gsl.openoffice.org/source/browse/gsl/vcl/inc/outdev.hxx?r1=1.65&r2=1.65.44.1 Delta lines: +5 -3 ------------------- --- outdev.hxx 2 Nov 2005 13:27:49 -0000 1.65 +++ outdev.hxx 5 Jan 2006 13:02:56 -0000 1.65.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: outdev.hxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.65.44.1 $ * - * last change: $Author: kz $ $Date: 2005/11/02 13:27:49 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -314,6 +314,8 @@ class VirtualDevice; class Printer; + +const char* ImplDbgCheckOutputDevice( const void* pObj ); class VCL_DLLPUBLIC OutputDevice : public Resource { File [changed]: window.hxx Url: http://gsl.openoffice.org/source/browse/gsl/vcl/inc/window.hxx?r1=1.72&r2=1.72.36.1 Delta lines: +7 -3 ------------------- --- window.hxx 10 Nov 2005 15:48:41 -0000 1.72 +++ window.hxx 5 Jan 2006 13:02:57 -0000 1.72.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: window.hxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.72.36.1 $ * - * last change: $Author: rt $ $Date: 2005/11/10 15:48:41 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -365,6 +365,10 @@ // ---------- // - Window - // ---------- + +#ifdef DBG_UTIL +const char* ImplDbgCheckWindow( const void* pObj ); +#endif class WindowImpl; class VCL_DLLPUBLIC Window : public OutputDevice Directory: /util/tools/inc/ =========================== File [changed]: fsys.hxx Url: http://util.openoffice.org/source/browse/util/tools/inc/fsys.hxx?r1=1.9&r2=1.9.36.1 Delta lines: +5 -3 ------------------- --- fsys.hxx 9 Sep 2005 13:40:50 -0000 1.9 +++ fsys.hxx 5 Jan 2006 13:02:57 -0000 1.9.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: fsys.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.36.1 $ * - * last change: $Author: rt $ $Date: 2005/09/09 13:40:50 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,6 +268,8 @@ // ------------ class DirEntryStack; + +const char* ImpCheckDirEntry( const void* p ); class TOOLS_DLLPUBLIC DirEntry { Directory: /graphics/goodies/source/filter.vcl/eos2met/ ======================================================= File [changed]: eos2met.cxx Url: http://graphics.openoffice.org/source/browse/graphics/goodies/source/filter.vcl/eos2met/eos2met.cxx?r1=1.13&r2=1.13.30.1 Delta lines: +7 -6 ------------------- --- eos2met.cxx 5 Oct 2005 13:06:14 -0000 1.13 +++ eos2met.cxx 5 Jan 2006 13:02:58 -0000 1.13.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: eos2met.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.30.1 $ * - * last change: $Author: kz $ $Date: 2005/10/05 13:06:14 $ + * last change: $Author: pmladek $ $Date: 2006/01/05 13:02:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,7 +120,7 @@ { struct METChrSet * pSucc; BYTE nSet; - ByteString aName; + String aName; FontWeight eWeight; }; @@ -423,7 +423,7 @@ pCS = new METChrSet; pCS->pSucc = pChrSetList; pChrSetList=pCS; pCS->nSet = nNextChrSetId++; - pCS->aName = ByteString( rFont.GetName(), gsl_getSystemTextEncoding() ); + pCS->aName = rFont.GetName(); pCS->eWeight = rFont.GetWeight(); } } @@ -488,10 +488,11 @@ *pMET << (BYTE)0x03 << (BYTE)0x52; *pMET << (BYTE)0x24 << (BYTE)0x02 << (BYTE)0x08 << (BYTE)0x00; + ByteString n(pCS->aName, gsl_getSystemTextEncoding()); for (i=0; i<32; i++) { if ( i == 0 || c != 0 ) - c = pCS->aName.GetChar( i ); + c = n.GetChar( i ); *pMET << c; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
