Author: hdu
Date: Wed Dec 18 10:35:07 2013
New Revision: 1551902
URL: http://svn.apache.org/r1551902
Log:
fix mis-merged lines
Modified:
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
openoffice/branches/rejuvenate01/main/curl/curl-7.19.7_win.patch
openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
openoffice/branches/rejuvenate01/main/libtextcat/libtextcat-2.2.patch
openoffice/branches/rejuvenate01/main/sdext/prj/d.lst
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx
openoffice/branches/rejuvenate01/main/vcl/source/fontsubset/cff.cxx
Modified:
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
Wed Dec 18 10:35:07 2013
@@ -169,7 +169,6 @@ type_info * RTTI::getRTTI( typelib_Compo
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr,"generated rtti for %s\n", rttiName );
#endif
-#if 0 // TODO: the derived type_info classes are not directly available => get
them indirectly?
if (pTypeDescr->pBaseTypeDescription)
{
// ensure availability of base
@@ -183,9 +182,7 @@ type_info * RTTI::getRTTI( typelib_Compo
// this class has no base class
rtti = new __class_type_info( strdup( rttiName ) );
}
-#else
- rtti = NULL;
-#endif
+
pair< t_rtti_map::iterator, bool > insertion(
m_generatedRttis.insert( t_rtti_map::value_type( unoName,
rtti ) ) );
OSL_ENSURE( insertion.second, "### inserting new generated
rtti failed?!" );
@@ -208,9 +205,7 @@ type_info * RTTI::getRTTI( typelib_Compo
static void deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
- if( !header->exceptionType) // TODO: remove this when getRTTI() always
returns non-NULL
- return; // NOTE: leak for now
- typelib_TypeDescription* pTD = NULL;
+ typelib_TypeDescription * pTD = 0;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pTD, unoName.pData );
OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction =>
leaking!!!" );
Modified: openoffice/branches/rejuvenate01/main/curl/curl-7.19.7_win.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/curl/curl-7.19.7_win.patch?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/curl/curl-7.19.7_win.patch (original)
+++ openoffice/branches/rejuvenate01/main/curl/curl-7.19.7_win.patch Wed Dec 18
10:35:07 2013
@@ -1,19 +1,19 @@
---- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100
-+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000
+0100
-@@ -46,13 +46,13 @@
- # Stem for static libs and DLLs
- #
- LIB_NAME = libcurl
--LIB_NAME_DEBUG = libcurld
-+LIB_NAME_DEBUG = libcurl
-
- #
- # Stem for DLL import libs
- #
--IMPLIB_NAME = libcurl_imp
--IMPLIB_NAME_DEBUG = libcurld_imp
-+IMPLIB_NAME = libcurl
-+IMPLIB_NAME_DEBUG = libcurl
-
- !IFNDEF OPENSSL_PATH
- OPENSSL_PATH = ../../openssl-0.9.8g
+--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100
++++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000
+0100
+@@ -46,13 +46,13 @@
+ # Stem for static libs and DLLs
+ #
+ LIB_NAME = libcurl
+-LIB_NAME_DEBUG = libcurld
++LIB_NAME_DEBUG = libcurl
+
+ #
+ # Stem for DLL import libs
+ #
+-IMPLIB_NAME = libcurl_imp
+-IMPLIB_NAME_DEBUG = libcurld_imp
++IMPLIB_NAME = libcurl
++IMPLIB_NAME_DEBUG = libcurl
+
+ !IFNDEF OPENSSL_PATH
+ OPENSSL_PATH = ../../openssl-0.9.8g
Modified: openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx Wed Dec 18
10:35:07 2013
@@ -281,8 +281,8 @@ ResMgr* Desktop::GetDesktopResManager()
OUString aVariant = aUILocaleString.getToken( 0, '-', nIndex);
::com::sun::star::lang::Locale aLocale( aLanguage, aCountry,
aVariant );
- Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale);
+ Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale);
AllSettings as = GetSettings();
as.SetUILocale(aLocale);
SetSettings(as);
Modified: openoffice/branches/rejuvenate01/main/libtextcat/libtextcat-2.2.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/libtextcat/libtextcat-2.2.patch?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/libtextcat/libtextcat-2.2.patch
(original)
+++ openoffice/branches/rejuvenate01/main/libtextcat/libtextcat-2.2.patch Wed
Dec 18 10:35:07 2013
@@ -24,7 +24,7 @@
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
# `"' quotes if we put them in here... so don't!
- archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o
$libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test
.$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+ archive_cmds='$CC $ARCH_FLAGS -r -keep_private_externs -nostdlib -o
${lib}-master.o $libobjs && $CC $ARCH_FLAGS $(test .$module = .yes && echo
-bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o
$deplibs$compiler_flags $(test .$module != .yes && echo -install_name
$rpath/$soname $verstring)'
++ archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o
$libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib ${lib}-master.o $deplibs$compiler_flags $(test
.$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
Modified: openoffice/branches/rejuvenate01/main/sdext/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sdext/prj/d.lst?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sdext/prj/d.lst (original)
+++ openoffice/branches/rejuvenate01/main/sdext/prj/d.lst Wed Dec 18 10:35:07
2013
@@ -3,6 +3,8 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
+
+
mkdir: %COMMON_DEST%\res%_EXT%
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
Modified:
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
Wed Dec 18 10:35:07 2013
@@ -134,7 +134,7 @@ private:
private:
::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
- typedef ::std::hash_map< rtl::OUString, NSString*, rtl::OUStringHash >
OfficeOnlyTypes;
+ typedef std::hash_map< rtl::OUString, NSString*, rtl::OUStringHash >
OfficeOnlyTypes;
mutable OfficeOnlyTypes maOfficeOnlyTypes;
};
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx Wed Dec 18
10:35:07 2013
@@ -33,7 +33,6 @@
#include "vos/thread.hxx"
#include "vcl/outdev.hxx"
#include "vcl/salnativewidgets.hxx"
-#include "sallayout.hxx"
#include <map>
@@ -44,6 +43,8 @@ class ImplFontMetricData;
struct ImplKernPairData;
class ImplFontData;
class ImplFontCharMap;
+class SalLayout;
+class ImplLayoutArgs;
class Rectangle;
class FontSubsetInfo;
class OutputDevice;
Modified: openoffice/branches/rejuvenate01/main/vcl/source/fontsubset/cff.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/fontsubset/cff.cxx?rev=1551902&r1=1551901&r2=1551902&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/fontsubset/cff.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/fontsubset/cff.cxx Wed Dec
18 10:35:07 2013
@@ -425,7 +425,7 @@ private:
const char* getString( int nStringID);
int getFDSelect( int nGlyphIndex) const;
int getGlyphSID( int nGlyphIndex) const;
- const char* getGlyphName( sal_GlyphId nGlyphIndex);
+ const char* getGlyphName( int nGlyphIndex);
void read2push( void);
void pop2write( void);
@@ -1840,7 +1840,7 @@ int CffSubsetterContext::getGlyphSID( in
// --------------------------------------------------------------------
// NOTE: the result becomes invalid with the next call to this method
-const char* CffSubsetterContext::getGlyphName( sal_GlyphId nGlyphIndex)
+const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
{
// the first glyph is always the .notdef glyph
const char* pGlyphName = ".notdef";
