[Libreoffice-commits] core.git: 4 commits - bin/update_pch.sh lotuswordpro/inc lotuswordpro/Library_lwpft.mk lotuswordpro/source starmath/source
Thomas Arnhold
thomas at arnhold.org
Mon May 19 16:50:29 PDT 2014
bin/update_pch.sh | 2
lotuswordpro/Library_lwpft.mk | 2
lotuswordpro/inc/pch/precompiled_lwpft.cxx | 12 ++
lotuswordpro/inc/pch/precompiled_lwpft.hxx | 80 +++++++++++++++++++
lotuswordpro/source/filter/genericfilter.cxx | 1
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 8 -
lotuswordpro/source/filter/lwpcharsetmgr.cxx | 2
lotuswordpro/source/filter/lwpoleobject.hxx | 2
lotuswordpro/source/filter/lwptools.cxx | 1
lotuswordpro/source/filter/xfilter/xfdefs.hxx | 2
lotuswordpro/source/filter/xfilter/xfglobal.hxx | 2
lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx | 2
lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx | 2
lotuswordpro/source/filter/xfilter/xfsaxstream.cxx | 1
starmath/source/accessibility.cxx | 8 -
15 files changed, 106 insertions(+), 21 deletions(-)
New commits:
commit d58fc49073ec69ce3a17b6a6613135af857ce4f7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 20 01:40:59 2014 +0200
WaE: -Wunused-variable
Change-Id: Ic39102eaa8f0f5f6ea58173103ca8c5dc5c55185
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 31d53f2..5032a2e 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -534,10 +534,6 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
aSize.Width() = nNodeIndex > 0 ? pXAry[nNodeIndex] - pXAry[nNodeIndex - 1] : pXAry[nNodeIndex];
delete[] pXAry;
-#if OSL_DEBUG_LEVEL > 1
- Point aLP00( pWin->LogicToPixel( Point(0,0)) );
- Point aPL00( pWin->PixelToLogic( Point(0,0)) );
-#endif
aTLPos = pWin->LogicToPixel( aTLPos );
aSize = pWin->LogicToPixel( aSize );
aRes.X = aTLPos.X();
@@ -593,10 +589,6 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoin
Point aTLPos ( aOffset );
aTLPos.X() -= 0;
Size aSize( pNode->GetSize() );
-#if OSL_DEBUG_LEVEL > 1
- Point aLP00( pWin->LogicToPixel( Point(0,0)) );
- Point aPL00( pWin->PixelToLogic( Point(0,0)) );
-#endif
Rectangle aRect( aTLPos, aSize );
if (aRect.IsInside( aPos ))
commit e5dce9439628f83fc8ed4ddddf86f341ee76008c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 20 01:36:41 2014 +0200
fix-includes.pl: lwp
Change-Id: Ib0c5d5c0b0b3c6c290e7e1bbe18464155232ace3
diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
index 07ca9f8..1892816 100644
--- a/lotuswordpro/inc/pch/precompiled_lwpft.hxx
+++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
@@ -15,13 +15,7 @@
*/
#include "assert.h"
-#include "rtl/textenc.h"
#include "string.h"
-#include "svx/xbitmap.hxx"
-#include "tools/stream.hxx"
-#include "vcl/bmpacc.hxx"
-#include "vcl/dibtools.hxx"
-#include "xmloff/attrlist.hxx"
#include <assert.h>
#include <boost/cast.hpp>
#include <boost/scoped_array.hpp>
@@ -71,10 +65,13 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
+#include <svx/xbitmap.hxx>
#include <tools/stream.hxx>
#include <ucbhelper/content.hxx>
#include <unicode/timezone.h>
#include <unicode/udat.h>
+#include <vcl/bmpacc.hxx>
+#include <vcl/dibtools.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vector>
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index 85cf12c..8a19cc9 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -63,10 +63,10 @@
#include "lwppttntbl.hxx"
#include "xfilter/xfbgimage.hxx"
-#include "tools/stream.hxx"
-#include "vcl/dibtools.hxx"
-#include "vcl/bmpacc.hxx"
-#include "svx/xbitmap.hxx"
+#include <tools/stream.hxx>
+#include <vcl/dibtools.hxx>
+#include <vcl/bmpacc.hxx>
+#include <svx/xbitmap.hxx>
void LwpBackgroundStuff::Read(LwpObjectStream* pStrm)
{
diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.cxx b/lotuswordpro/source/filter/lwpcharsetmgr.cxx
index 02ea5c2..f1d31a4 100644
--- a/lotuswordpro/source/filter/lwpcharsetmgr.cxx
+++ b/lotuswordpro/source/filter/lwpcharsetmgr.cxx
@@ -59,7 +59,7 @@
************************************************************************/
#include "lwpcharsetmgr.hxx"
//Added for SS migration
-#include "rtl/textenc.h"
+#include <rtl/textenc.h>
LwpCharSetMgr* LwpCharSetMgr::Instance = NULL;
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index a8cb30a..bcbc867 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -68,7 +68,7 @@
#include "lwpobjhdr.hxx"
#include "lwpobjid.hxx"
#include "lwpstory.hxx"
-#include "tools/gen.hxx"
+#include <tools/gen.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
#include <sfx2/objsh.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xfdefs.hxx b/lotuswordpro/source/filter/xfilter/xfdefs.hxx
index 8200a8a..8c199e9 100644
--- a/lotuswordpro/source/filter/xfilter/xfdefs.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdefs.hxx
@@ -60,7 +60,7 @@
#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
-#include "sal/types.h"
+#include <sal/types.h>
enum enumXFContent
{
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
index 5b49f4b..a7c4321 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
@@ -63,7 +63,7 @@
#include <cassert>
-#include "sal/types.h"
+#include <sal/types.h>
#include <rtl/ustring.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
index 047a448..6415f3c 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
@@ -58,7 +58,7 @@
* Document object of the xml filter framework.
************************************************************************/
#include "xfsaxattrlist.hxx"
-#include "xmloff/attrlist.hxx"
+#include <xmloff/attrlist.hxx>
XFSaxAttrList::XFSaxAttrList()
{
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index fa218a9..38d2908 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -61,7 +61,7 @@
#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
#include "ixfattrlist.hxx"
-#include "xmloff/attrlist.hxx"
+#include <xmloff/attrlist.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
class XFSaxAttrList : public IXFAttrList
commit 023547ab9aacb23534b1d792aca3152d96540e0c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 20 01:29:33 2014 +0200
update_pch: add lwp
2m21s -> 47s
Change-Id: I5fd321bb34840c71f22705790aab06e83350261e
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index f01261d..8cc8b96 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Library_Library,lwpft))
$(eval $(call gb_Library_use_sdk_api,lwpft))
+$(eval $(call gb_Library_set_precompiled_header,lwpft,$(SRCDIR)/lotuswordpro/inc/pch/precompiled_lwpft))
+
$(eval $(call gb_Library_use_libraries,lwpft,\
comphelper \
cppu \
diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.cxx b/lotuswordpro/inc/pch/precompiled_lwpft.cxx
new file mode 100644
index 0000000..2f3866c
--- /dev/null
+++ b/lotuswordpro/inc/pch/precompiled_lwpft.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_lwpft.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
new file mode 100644
index 0000000..07ca9f8
--- /dev/null
+++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All such
+ manual changes will be rewritten by the next run of update_pch.sh (which presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
+#include "assert.h"
+#include "rtl/textenc.h"
+#include "string.h"
+#include "svx/xbitmap.hxx"
+#include "tools/stream.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/dibtools.hxx"
+#include "xmloff/attrlist.hxx"
+#include <assert.h>
+#include <boost/cast.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <cassert>
+#include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/XParser.hpp>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <i18nlangtag/languagetagicu.hxx>
+#include <limits.h>
+#include <math.h>
+#include <memory>
+#include <new>
+#include <osl/diagnose.h>
+#include <osl/file.h>
+#include <osl/file.hxx>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <osl/thread.h>
+#include <osl/thread.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/textenc.h>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/macros.h>
+#include <sfx2/docfile.hxx>
+#include <sfx2/printer.hxx>
+#include <sot/storinfo.hxx>
+#include <sstream>
+#include <stdio.h>
+#include <string.h>
+#include <tools/stream.hxx>
+#include <ucbhelper/content.hxx>
+#include <unicode/timezone.h>
+#include <unicode/udat.h>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
+#include <vector>
+#include <xmloff/attrlist.hxx>
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 8708ae2..5187b7a 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -8,7 +8,6 @@
#include "LotusWordProImportFilter.hxx"
-using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index 897a913..8645a05 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -79,7 +79,6 @@
#define SEPARATOR '\\'
#endif
-using namespace icu;
using namespace ::rtl;
using namespace ::osl;
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index 1e05776..9419630 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -70,7 +70,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::io;
commit d06a8cddc0483be41e1cd8252fd23674f65b1f15
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 20 01:26:23 2014 +0200
update_pch.sh: ignore a icu header file
Change-Id: I2654933e1e6f50902be6b992767ab5caac273f9c
diff --git a/bin/update_pch.sh b/bin/update_pch.sh
index 241ce6c..6b425cb 100755
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -127,12 +127,14 @@ function local_file()
function filter_ignore()
(
# - filter out all files that are not normal headers
+# - unicode/datefm.h is a icu header, clashes with DateFormat definition
# - gperffasttoken.hxx is not a proper header
# - sores.hxx provides BMP_PLUGIN, which is redefined
# - some sources play ugly #define tricks with editeng/eeitemid.hxx
# - jerror.h and jpeglib.h are not self-contained
# - service1.hxx/service2.hxx are inside comments in frameworks/
grep -E -e '\.h[">]$' -e '\.hpp[">]$' -e '\.hdl[">]$' -e '\.hxx[">]$' -e '^[^\.]*>$' | \
+ grep -v -F -e '#include <unicode/datefmt.h>' | \
grep -v -F -e '#include "gperffasttoken.hxx"' | \
grep -v -F -e '#include <svtools/sores.hxx>' | \
grep -v -F -e '#include <editeng/eeitemid.hxx>' | \
More information about the Libreoffice-commits
mailing list