oox/inc/oox/export/chartexport.hxx | 1 sal/qa/osl/process/osl_Thread.cxx | 3 solenv/gbuild/Helper.mk | 10 sw/Library_msword.mk | 2 sw/inc/pch/precompiled_msword.cxx | 12 + sw/inc/pch/precompiled_msword.hxx | 257 ++++++++++++++++++++++ sw/inc/pch/precompiled_sw.hxx | 27 -- sw/source/filter/ww8/wrtw8esh.cxx | 6 writerfilter/inc/pch/precompiled_writerfilter.hxx | 1 xmloff/inc/pch/precompiled_xmloff.hxx | 1 10 files changed, 285 insertions(+), 35 deletions(-)
New commits: commit 481bc6cf3d8ab8b7f37c709bbe4e7f83b60ef8ec Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Dec 12 23:14:01 2012 +0100 substitute BUILDDIR in gb_Helper_abbreviate_dirs too diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f81a6b4..25cf47f 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -38,12 +38,22 @@ gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY $(gb_Helper_MISCDUMMY) : @mkdir -p $(dir $@) && touch $@ +ifeq ($(SRCDIR),$(BUILDDIR)) define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ $(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1)))) endef +else +define gb_Helper_abbreviate_dirs +S=$(SRCDIR) && \ +$(subst $(SRCDIR)/,$$S/,B=$(BUILDDIR)) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,O=$(OUTDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,W=$(WORKDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1))))) +endef +endif define gb_Helper_abbreviate_dirs_native $(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use gb_Helper_abbreviate_dirs instead.) commit 40a0f91d63530959e04f7851e3390561780f9ad5 Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Dec 12 23:12:33 2012 +0100 NOMINMAX on Windows is defined globally diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 11214bd..3e394aa 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -18,9 +18,6 @@ */ #ifdef WNT -#if defined _MSC_VER -#define NOMINMAX -#endif #include <windows.h> #else #include <unistd.h> commit 4a4d3e08f6abb2bb20f8937e4d704d372bd0bd25 Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Dec 12 18:12:42 2012 +0100 update PCH headers diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 777b491..991c412 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -34,7 +34,6 @@ #include <boost/bind.hpp> #include <boost/foreach.hpp> #include <boost/ptr_container/ptr_set.hpp> -#include <boost/ptr_container/ptr_vector.hpp> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -58,7 +57,6 @@ #include <comphelper/MasterPropertySetInfo.hxx> #include <comphelper/mediadescriptor.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/property.hxx> #include <comphelper/scoped_disposing_ptr.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequenceasvector.hxx> @@ -113,7 +111,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertyStateChangeListener.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> @@ -244,10 +241,6 @@ #include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <com/sun/star/mail/MailAttachment.hpp> -#include "com/sun/star/mail/MailServiceProvider.hpp" -#include "com/sun/star/mail/MailServiceType.hpp" -#include "com/sun/star/mail/XMailService.hpp" #include "com/sun/star/mail/XSmtpService.hpp" #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> @@ -272,7 +265,6 @@ #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -282,12 +274,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> -#include <com/sun/star/sdb/XColumn.hpp> -#include <com/sun/star/sdb/XCompletedConnection.hpp> -#include <com/sun/star/sdb/XCompletedExecution.hpp> #include <com/sun/star/sdb/XDatabaseAccess.hpp> -#include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/DropCapFormat.hpp> @@ -313,7 +300,6 @@ #include <com/sun/star/table/TableBorder2.hpp> #include <com/sun/star/table/TableSortField.hpp> #include <com/sun/star/table/XCellRange.hpp> -#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/text/BibliographyDataField.hpp> @@ -410,7 +396,6 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> #include <com/sun/star/util/CloseVetoException.hpp> @@ -419,7 +404,6 @@ #include <com/sun/star/util/DateTimeRange.hpp> #include <com/sun/star/util/Duration.hpp> #include <com/sun/star/util/MeasureUnit.hpp> -#include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/Time.hpp> @@ -431,7 +415,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XRefreshListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/DocumentZoomType.hpp> @@ -524,7 +507,6 @@ #include <editeng/lrspitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/measfld.hxx> -#include <editeng/memberids.hrc> #include <editeng/nhypitem.hxx> #include <editeng/nlbkitem.hxx> #include <editeng/numitem.hxx> @@ -613,7 +595,6 @@ #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/tencinfo.h> -#include <rtl/textenc.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> @@ -630,7 +611,6 @@ #include <sfx2/appuno.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/dialogs.hrc> #include <sfx2/dinfdlg.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfac.hxx> @@ -673,10 +653,8 @@ #include <sfx2/sfxbasecontroller.hxx> #include <sfx2/sfxdlg.hxx> #include <sfx2/sfxhelp.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxhtml.hxx> #include <sfx2/sfxmodelfactory.hxx> -#include <sfx2/sfxsids.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/styfitem.hxx> #include <sfx2/tabdlg.hxx> @@ -764,10 +742,8 @@ #include <svtools/ruler.hxx> #include <svtools/sfxecode.hxx> #include <svtools/soerr.hxx> -#include <svtools/stdctrl.hxx> #include <svtools/svmedit.hxx> #include <svtools/svparser.hxx> -#include <svtools/svtools.hrc> #include <svtools/svtresid.hxx> #include <svtools/templdlg.hxx> #include <svtools/transfer.hxx> @@ -786,7 +762,6 @@ #include <svx/dataaccessdescriptor.hxx> #include <svx/dbaexchange.hxx> #include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> #include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> #include <svx/extedit.hxx> @@ -899,8 +874,6 @@ #include <svx/svdviter.hxx> #include <svx/svxdlg.hxx> #include <svx/svxerr.hxx> -#include "svx/svxids.hrc" -#include <svx/svxids.hrc> #include <svx/swframevalidation.hxx> #include <svx/sxciaitm.hxx> #include <svx/sxenditm.hxx> diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index b10ed67..02e5e9b 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -200,7 +200,6 @@ #include <svl/lngmisc.hxx> #include <svtools/grfmgr.hxx> #include <svtools/wmf.hxx> -#include <svx/dialogs.hrc> #include <tools/color.hxx> #include <tools/globname.hxx> #include <tools/resmgr.hxx> diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index dc0adc9..845df83 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -546,7 +546,6 @@ #include <unotools/streamwrap.hxx> #include <unotools/syslocale.hxx> #include <utility> -#include "vector" #include <vector> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit c206fffbdcdb2b31b9c933a9106faa4dd6e146ee Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Dec 12 09:38:13 2012 +0100 PCH for Library_msword diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx index dbe94f1..f801fc3 100644 --- a/oox/inc/oox/export/chartexport.hxx +++ b/oox/inc/oox/export/chartexport.hxx @@ -23,6 +23,7 @@ #include <oox/dllapi.h> #include <com/sun/star/uno/XReference.hpp> #include <oox/export/drawingml.hxx> +#include <oox/token/tokens.hxx> #include <sax/fshelper.hxx> #include <vcl/mapmod.hxx> #include <boost/unordered_map.hpp> diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index cae89b5..0219888 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword)) $(eval $(call gb_Library_use_package,msword,writerfilter_sprmids)) +$(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword)) + $(eval $(call gb_Library_set_include,msword,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/ui/inc \ diff --git a/sw/inc/pch/precompiled_msword.cxx b/sw/inc/pch/precompiled_msword.cxx new file mode 100644 index 0000000..16cc0c9 --- /dev/null +++ b/sw/inc/pch/precompiled_msword.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_msword.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx new file mode 100644 index 0000000..4aacce2 --- /dev/null +++ b/sw/inc/pch/precompiled_msword.hxx @@ -0,0 +1,257 @@ +/* -*- 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 <algorithm> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/polygon/b2dpolygon.hxx> +#include <basic/basmgr.hxx> +#include <boost/scoped_array.hpp> +#include <boost/scoped_ptr.hpp> +#include <comphelper/docpasswordrequest.hxx> +#include <comphelper/extract.hxx> +#include <comphelper/mediadescriptor.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/stlunosequence.hxx> +#include <comphelper/storagehelper.hxx> +#include <comphelper/string.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertyContainer.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> +#include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/document/XFilter.hpp> +#include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/drawing/XConnectableShape.hpp> +#include <com/sun/star/drawing/XConnectorShape.hpp> +#include <com/sun/star/drawing/XControlShape.hpp> +#include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/drawing/XShapeAligner.hpp> +#include <com/sun/star/drawing/XShapeArranger.hpp> +#include <com/sun/star/drawing/XShapeGroup.hpp> +#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/drawing/XShapeMirror.hpp> +#include <com/sun/star/drawing/XUniversalShapeDescriptor.hpp> +#include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/embed/XClassifiedObject.hpp> +#include <com/sun/star/embed/XEmbedPersist.hpp> +#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/form/XFormComponent.hpp> +#include <com/sun/star/form/XFormController.hpp> +#include <com/sun/star/form/XForm.hpp> +#include <com/sun/star/form/XFormsSupplier.hpp> +#include <com/sun/star/form/XImageProducerSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/XStorable.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/WordType.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/script/vba/XVBACompatibility.hpp> +#include <com/sun/star/text/TextContentAnchorType.hpp> +#include <com/sun/star/text/VertOrientation.hpp> +#include <com/sun/star/text/XTextRange.hpp> +#include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <com/sun/star/ui/ItemType.hpp> +#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/XImageManager.hpp> +#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> +#include <com/sun/star/util/XCloseable.hpp> +#include <cppuhelper/implementationentry.hxx> +#include <cstdio> +#include <cstring> +#include <ctype.h> +#include <editeng/adjitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/blnkitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/emphitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/forbiddenruleitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/hngpnctitem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/charhiddenitem.hxx> +#include <editeng/charreliefitem.hxx> +#include <editeng/charrotateitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/keepitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/opaqitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/paperinf.hxx> +#include <editeng/paravertalignitem.hxx> +#include <editeng/pbinitem.hxx> +#include <editeng/pgrditem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/protitem.hxx> +#include <editeng/scriptspaceitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/svxfont.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/twolinesitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <filter/msfilter/mscodec.hxx> +#include <filter/msfilter/msdffimp.hxx> +#include <filter/msfilter/msoleexp.hxx> +#include <filter/msfilter/rtfutil.hxx> +#include <filter/msfilter/svxmsbas.hxx> +#include <fstream> +#include <functional> +#include <iostream> +#include <iterator> +#include <i18npool/lang.h> +#include <i18npool/languagetag.hxx> +#include <i18npool/mslangid.hxx> +#include <list> +#include <map> +#include <math.h> +#include <oox/export/drawingml.hxx> +#include <oox/export/chartexport.hxx> +#include <oox/export/utils.hxx> +#include <oox/export/vmlexport.hxx> +#include <oox/mathml/export.hxx> +#include <oox/ole/olehelper.hxx> +#include <oox/ole/olestorage.hxx> +#include <oox/ole/vbaproject.hxx> +#include <oox/token/tokens.hxx> +#include <osl/diagnose.h> +#include <osl/endian.h> +#include <osl/file.hxx> +#include <osl/time.h> +#include <rtl/math.hxx> +#include <rtl/random.h> +#include <rtl/tencinfo.h> +#include <rtl/ustrbuf.hxx> +#include <rtl/ustring.hxx> +#include "sal/config.h" +#include <sal/macros.h> +#include <sal/types.h> +#include <set> +#include <sfx2/app.hxx> +#include <sfx2/docfile.hxx> +#include <sfx2/docinf.hxx> +#include <sfx2/fcontnr.hxx> +#include <sfx2/frame.hxx> +#include <sfx2/linkmgr.hxx> +#include <sfx2/request.hxx> +#include <sfx2/sfxbasemodel.hxx> +#include <sot/exchange.hxx> +#include <sot/storage.hxx> +#include <sot/storinfo.hxx> +#include <stdarg.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <svl/itemiter.hxx> +#include <svl/stritem.hxx> +#include "svl/urihelper.hxx" +#include <svl/urihelper.hxx> +#include <svl/whiter.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <svtools/embedhlp.hxx> +#include <svtools/filter.hxx> +#include <svtools/imap.hxx> +#include <svtools/imapobj.hxx> +#include <svtools/miscopt.hxx> +#include <svtools/rtfkeywd.hxx> +#include <svx/fmglob.hxx> +#include <svx/rectenum.hxx> +#include <svx/sdtaitm.hxx> +#include <svx/svdmodel.hxx> +#include <svx/svdoashp.hxx> +#include <svx/svdoattr.hxx> +#include <svx/svdobj.hxx> +#include <svx/svdocapt.hxx> +#include <svx/svdocirc.hxx> +#include <svx/svdograf.hxx> +#include <svx/svdogrp.hxx> +#include <svx/svdoole2.hxx> +#include <svx/svdopath.hxx> +#include <svx/svdotext.hxx> +#include <svx/svdouno.hxx> +#include <svx/svdpage.hxx> +#include <svx/svdview.hxx> +#include <svx/svxerr.hxx> +#include <svx/sxctitm.hxx> +#include <svx/unoapi.hxx> +#include <svx/unoshape.hxx> +#include <svx/xfillit.hxx> +#include <svx/xflclit.hxx> +#include <svx/xfltrit.hxx> +#include <svx/xlineit.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/solar.h> +#include <tools/stream.hxx> +#include <tools/string.hxx> +#include <tools/tenccvt.hxx> +#include <tools/urlobj.hxx> +#include <ucbhelper/content.hxx> +#include <unicode/ubidi.h> +#include <unotools/configmgr.hxx> +#include <unotools/fltrcfg.hxx> +#include <unotools/fontcvt.hxx> +#include <unotools/localedatawrapper.hxx> +#include <unotools/localfilehelper.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/streamwrap.hxx> +#include <unotools/tempfile.hxx> +#include <unotools/ucbstreamhelper.hxx> +#include <utility> +#include <vcl/cvtgrf.hxx> +#include <vcl/font.hxx> +#include <vcl/graph.hxx> +#include <vcl/outdev.hxx> +#include <vcl/salbtype.hxx> +#include <vcl/svapp.hxx> +#include <vcl/temporaryfonts.hxx> +#include <vcl/vclenum.hxx> +#include <vcl/virdev.hxx> +#include <vector> +#include <writerfilter/doctok/sprmids.hxx> +#include <xmloff/odffields.hxx> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 719d8e6..eaaeeaf 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -121,8 +121,8 @@ namespace CompareDrawObjs(const WW8Export& rWrt) : wrt(rWrt) {}; bool operator()(DrawObj *a, DrawObj *b) const { - sal_uLong aSort = ::lcl_getSdrOrderNumber(wrt, a); - sal_uLong bSort = ::lcl_getSdrOrderNumber(wrt, b); + sal_uLong aSort = lcl_getSdrOrderNumber(wrt, a); + sal_uLong bSort = lcl_getSdrOrderNumber(wrt, b); return aSort < bSort; } }; @@ -141,7 +141,7 @@ namespace { rDstArr.push_back( &rSrcArr[i] ); } - std::sort(rDstArr.begin(), rDstArr.end(), ::CompareDrawObjs(rWrt)); + std::sort(rDstArr.begin(), rDstArr.end(), CompareDrawObjs(rWrt)); } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
