diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
commit | 75a78c3224b3aa4b626381b8f4993019a2ea4036 (patch) | |
tree | 9de4fc4a455e66d5d478dbfb97655e09fef3ec2c /sw/inc/EnhancedPDFExportHelper.hxx | |
parent | 1cb177f424942549b547c2113129d607dec3c1e5 (diff) | |
parent | ae9f68d1e73a973046deee6fd602a2a4c3eba2a3 (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
Diffstat (limited to 'sw/inc/EnhancedPDFExportHelper.hxx')
-rw-r--r-- | sw/inc/EnhancedPDFExportHelper.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index f4e0e63726..1d106e147b 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -149,7 +149,7 @@ class SwTaggedPDFHelper // This will be incremented for each BeginTag() call. // It denotes the number of tags to close during EndStructureElements(); - BYTE nEndStructureElement; + sal_uInt8 nEndStructureElement; // If an already existing tag is reopened for follows of flow frames, // this value stores the tag id which has to be restored. |