sw/source/core/text/EnhancedPDFExportHelper.cxx | 1 - sw/source/core/text/itrpaint.cxx | 1 - sw/source/core/unocore/unoobj.cxx | 1 - sw/source/filter/html/htmlatr.cxx | 1 - sw/source/filter/ww8/docxattributeoutput.cxx | 1 + sw/source/filter/ww8/docxfootnotes.hxx | 22 +++++++++------------- 6 files changed, 10 insertions(+), 17 deletions(-)
New commits: commit 8ae46066e6b03e70901bbacf972e6965a43f3c53 Author: Matteo Casalin <[email protected]> Date: Tue Aug 13 22:51:49 2013 +0200 Cleanup #include and minor optimization Change-Id: I9b893906df5707f84c45cf5a8dc017873452aeab Reviewed-on: https://gerrit.libreoffice.org/5403 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Tor Lillqvist <[email protected]> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index be62045..dde5b36 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -55,7 +55,6 @@ #include <docufld.hxx> #include <ftnidx.hxx> #include <txtftn.hxx> -#include <fmtftn.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> #include <txtfrm.hxx> diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 185979f..4ea781f 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -29,7 +29,6 @@ #include <fchrfmt.hxx> #include <frmatr.hxx> #include <sfx2/printer.hxx> -#include <fmtftn.hxx> #include <fmtfld.hxx> #include <fldbas.hxx> // SwField #include <rootfrm.hxx> diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 013f0ed..f898d1c 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -81,7 +81,6 @@ #include <svtools/ctrltool.hxx> #include <flypos.hxx> #include <txtftn.hxx> -#include <fmtftn.hxx> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/TextMarkupType.hpp> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 02fcb4a..5ae4128 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -55,7 +55,6 @@ #include <fmtpdsc.hxx> #include <fmtflcnt.hxx> #include <fmtinfmt.hxx> -#include <fmtftn.hxx> #include <txatbase.hxx> #include <frmatr.hxx> #include <charfmt.hxx> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 51caae9..7ea8024 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -23,6 +23,7 @@ #include "writerwordglue.hxx" #include "ww8par.hxx" #include "fmtcntnt.hxx" +#include "fmtftn.hxx" #include "fchrfmt.hxx" #include "tgrditem.hxx" #include "fmtruby.hxx" diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index 58134e2..23ce08c 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -17,17 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DOCXFOOTNOTES_HXX_ -#define _DOCXFOOTNOTES_HXX_ - -#include <fmtftn.hxx> - -#include <rtl/string.hxx> -#include <rtl/ustring.hxx> -#include <sax/fshelper.hxx> +#ifndef DOCXFOOTNOTES_HXX +#define DOCXFOOTNOTES_HXX #include <vector> +class SwFmtFtn; + namespace docx { typedef ::std::vector< const SwFmtFtn* > FootnotesVector; @@ -56,10 +52,6 @@ public: /// Return the current footnote/endnote and clear the 'current' state. const SwFmtFtn* getCurrent( sal_Int32& rId ) { - // skip ids 0 and 1 - they are reserved for separator and - // continuationSeparator - rId = m_nCurrent + 2; - // anything to write at all? if ( m_nCurrent < 0 ) { @@ -67,6 +59,10 @@ public: return NULL; } + // skip ids 0 and 1 - they are reserved for separator and + // continuationSeparator + rId = m_nCurrent + 2; + const SwFmtFtn *pFootnote = m_aFootnotes[m_nCurrent]; m_nCurrent = -1; @@ -88,6 +84,6 @@ public: } // namespace docx -#endif // _DOCXFOOTNOTES_HXX_ +#endif // DOCXFOOTNOTES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
