mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS cmcfixes77

Browse Source
This commit is contained in:
Vladimir Glazunov
2010-08-25 17:13:00 +02:00
parent aa80823112 840d9a7c6a
commit 9b727fc028
37 changed files with 94 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basebmp/test/basictest.cxx
View File

@@ -27,10 +27,12 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>

2
basebmp/test/bmpmasktest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>

2
basebmp/test/bmptest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>

2
basebmp/test/cliptest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>

2
basebmp/test/filltest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>

2
basebmp/test/linetest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>

7
basebmp/test/makefile.mk
View File

@@ -60,6 +60,13 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGSCXX+=-DADAPT_EXT_STL
.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------

2
basebmp/test/masktest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>

2
basebmp/test/polytest.cxx
View File

@@ -27,9 +27,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>

2
basegfx/test/basegfx1d.cxx
View File

@@ -30,10 +30,12 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "postextstl.h"
namespace basegfx1d
{

2
basegfx/test/basegfx2d.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>

2
basegfx/test/basegfx3d.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
namespace basegfx3d
{

2
basegfx/test/basegfxtools.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/tools/keystoplerp.hxx>
#include <basegfx/numeric/ftools.hxx>

2
basegfx/test/boxclipper.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>

2
basegfx/test/clipstate.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/tools/b2dclipstate.hxx>
#include <basegfx/range/b2dpolyrange.hxx>

2
basegfx/test/genericclipper.cxx
View File

@@ -30,9 +30,11 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>

7
basegfx/test/makefile.mk
View File

@@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGSCXX+=-DADAPT_EXT_STL
.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------

4
canvas/source/cairo/cairo_textlayout.cxx
View File

@@ -521,8 +521,8 @@ namespace cairocanvas
nWidth = aFont.GetHeight();
} else {
// any scaling needs to be relative to the platform-dependent definition
// of width of the font
nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth();
// of height of the font
nWidth = aFont.GetWidth() * aFont.GetHeight() / aMetric.GetHeight();
}
cairo_matrix_init_identity(&m);

7
o3tl/qa/makefile.mk
View File

@@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGSCXX+=-DADAPT_EXT_STL
.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
.IF "$(L10N_framework)"==""

2
o3tl/qa/test-cow_wrapper.cxx
View File

@@ -1,9 +1,11 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "postextstl.h"
#include "cow_wrapper_clients.hxx"

2
o3tl/qa/test-heap_ptr.cxx
View File

@@ -25,9 +25,11 @@
*
************************************************************************/
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <o3tl/heap_ptr.hxx>

2
o3tl/qa/test-range.cxx
View File

@@ -25,9 +25,11 @@
*
************************************************************************/
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <o3tl/range.hxx>
#include <vector>

2
o3tl/qa/test-vector_pool.cxx
View File

@@ -1,8 +1,10 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "postextstl.h"
#include <o3tl/vector_pool.hxx>

2
psprint_config/prj/build.lst
View File

@@ -1,4 +1,4 @@
pc psprint_config : soltools afms NULL
pc psprint_config : soltools AFMS:afms NULL
pc psprint_config usr1 - all pc_mkout NULL
pc psprint_config\configuration nmake - u pc_conf NULL
pc psprint_config\configuration\ppds nmake - u pc_ppds NULL

7
sax/qa/cppunit/makefile.mk
View File

@@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGSCXX+=-DADAPT_EXT_STL
.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files

2
sax/qa/cppunit/test_converter.cxx
View File

@@ -25,10 +25,12 @@
*
************************************************************************/
#include "preextstl.h"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include "postextstl.h"
#include <rtl/ustrbuf.hxx>

13
svtools/source/config/menuoptions.cxx
View File

@@ -314,9 +314,16 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
// We need values from ALL notified configuration keys.
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
sal_Bool bMenuIcons = true;
sal_Bool bSystemMenuIcons = true;
sal_Bool bMenuSettingsChanged = false;
sal_Bool bMenuSettingsChanged = sal_False;
sal_Bool bMenuIcons = sal_True;
sal_Bool bSystemMenuIcons = sal_True;
if (m_nMenuIcons == 2)
bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
else
{
bSystemMenuIcons = sal_False;
bMenuIcons = m_nMenuIcons ? sal_True : sal_False;
}
// Step over list of property names and get right value from coreesponding value list to set it on internal members!
sal_Int32 nCount = seqPropertyNames.getLength();

36
tools/inc/tools/postextstl.h
View File

@@ -1,36 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifdef std_was_redefined_as_stlport
// put things back the way they were
# define std std_was_redefined_as_stlport
# undef _STLP_OUTERMOST_HEADER_ID
// force config to be re-read
# undef _STLP_NOTHROW_INHERENTLY
# undef _STLP_CONFIG_H
# include <stddef.h>
#endif

71
tools/inc/tools/preextstl.h
View File

@@ -1,71 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
//1. Force inclusion of a std:: using header to ensure the stlport define
//of std as "stlport"
#include <algorithm>
#if defined(ADAPT_EXT_STL)
//2. Force inclusion of stlport headers to get their stlport:: definitions
# include <ostream>
# include <istream>
# include <fstream>
# include <iostream>
# include <vector>
# include <list>
# include <map>
//3. Now force inclusion of native headers to get their std:: definitions
# if defined(std)
# define std_was_redefined_as_stlport std
# undef std
# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
# if defined(_GNUC__)
# pragma GCC visibility push(default)
# endif
# include _STLP_NATIVE_HEADER(exception_defines.h)
# include _STLP_NATIVE_HEADER(limits)
# include _STLP_NATIVE_HEADER(memory)
# include _STLP_NATIVE_HEADER(exception)
# include _STLP_NATIVE_HEADER(iosfwd)
# include _STLP_NATIVE_HEADER(algorithm)
# include _STLP_NATIVE_HEADER(string)
# include _STLP_NATIVE_HEADER(streambuf)
# include _STLP_NATIVE_HEADER(ios)
# include _STLP_NATIVE_HEADER(locale)
# include _STLP_NATIVE_HEADER(stdexcept)
# include _STLP_NATIVE_HEADER(ostream)
# include _STLP_NATIVE_HEADER(istream)
# include _STLP_NATIVE_HEADER(iostream)
# include _STLP_NATIVE_HEADER(vector)
# include _STLP_NATIVE_HEADER(list)
# include _STLP_NATIVE_HEADER(map)
# if defined(_GNUC__)
# pragma GCC visibility pop
# endif
# endif
#endif
//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
//against regardless of whether that is stlport or system stl
namespace ext_std = std;

3
tools/prj/d.lst
View File

@@ -34,9 +34,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
..\inc\tools\postextstl.h %_DEST%\inc%_EXT%\tools\postextstl.h
..\inc\tools\preextstl.h %_DEST%\inc%_EXT%\tools\preextstl.h
..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx

4
vcl/inc/vcl/graphite_adaptors.hxx
View File

@@ -55,11 +55,11 @@
#include "vcl/dllapi.h"
// Libraries
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Font.h>
#include <graphite/ITextSource.h>
#include <tools/postextstl.h>
#include <postextstl.h>
// Module type definitions and forward declarations.
//

4
vcl/inc/vcl/graphite_features.hxx
View File

@@ -29,11 +29,11 @@
// Parse a string of features specified as ; separated pairs.
// e.g.
// 1001=1&2002=2&fav1=0
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Font.h>
#include <graphite/GrFeature.h>
#include <tools/postextstl.h>
#include <postextstl.h>
namespace grutils
{

4
vcl/inc/vcl/graphite_layout.hxx
View File

@@ -40,13 +40,13 @@
#include <vector>
#include <utility>
// Libraries
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Font.h>
#include <graphite/GrConstants.h>
#include <graphite/GrAppData.h>
#include <graphite/SegmentAux.h>
#include <tools/postextstl.h>
#include <postextstl.h>
// Platform
#include <vcl/sallayout.hxx>
#include <vcl/dllapi.h>

4
vcl/source/glyphs/graphite_cache.cxx
View File

@@ -36,10 +36,10 @@
#include <tools/debug.hxx>
#include <vcl/sallayout.hxx>
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Segment.h>
#include <tools/postextstl.h>
#include <postextstl.h>
#include <rtl/ustring.hxx>
#include <vcl/graphite_layout.hxx>

4
vcl/source/glyphs/graphite_layout.cxx
View File

@@ -67,13 +67,13 @@
#include <unicode/uscript.h>
// Graphite Libraries (must be after vcl headers on windows)
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Font.h>
#include <graphite/ITextSource.h>
#include <graphite/Segment.h>
#include <graphite/SegmentPainter.h>
#include <tools/postextstl.h>
#include <postextstl.h>
#include <vcl/graphite_layout.hxx>
#include <vcl/graphite_features.hxx>

4
vcl/source/glyphs/graphite_textsrc.hxx
View File

@@ -59,11 +59,11 @@
#include "vcl/dllapi.h"
// Libraries
#include <tools/preextstl.h>
#include <preextstl.h>
#include <graphite/GrClient.h>
#include <graphite/Font.h>
#include <graphite/ITextSource.h>
#include <tools/postextstl.h>
#include <postextstl.h>
// Module type definitions and forward declarations.
//

2
vcl/util/makefile2.pmk
View File

@@ -36,6 +36,6 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
#building with stlport, but graphite was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_GRAPHITE)"=="YES"
CDEFS += -DADAPT_EXT_STL
CFLAGSCXX+=-DADAPT_EXT_STL
.ENDIF
.ENDIF