[Libreoffice-commits] .: 2 commits - editeng/inc editeng/Library_editeng.mk editeng/source l10ntools/inc l10ntools/source sc/source sd/source sfx2/inc sfx2/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/Library_msword.mk sw/source tools/inc tools/source unusedcode.easy vbahelper/inc vbahelper/source vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 10 01:28:45 PST 2012
editeng/Library_editeng.mk | 1
editeng/inc/editeng/svxrtf.hxx | 47 --
editeng/source/editeng/eertfpar.cxx | 14
editeng/source/rtf/rtfgrf.cxx | 531 -------------------------
l10ntools/inc/export.hxx | 2
l10ntools/source/export2.cxx | 25 -
sc/source/ui/dbgui/fieldwnd.cxx | 12
sc/source/ui/inc/fieldwnd.hxx | 1
sc/source/ui/vba/vbaworkbook.cxx | 10
sc/source/ui/vba/vbaworkbook.hxx | 3
sd/source/ui/app/sdxfer.cxx | 5
sd/source/ui/inc/sdxfer.hxx | 5
sfx2/inc/docvor.hxx | 2
sfx2/source/doc/docvor.cxx | 2
svl/inc/svl/zforlist.hxx | 4
svl/source/numbers/zforlist.cxx | 14
svtools/inc/svtools/grfmgr.hxx | 1
svtools/source/filter/wmf/emfwr.cxx | 15
svtools/source/graphic/grfmgr.cxx | 25 -
svx/inc/svx/fontlb.hxx | 3
svx/inc/svx/numvset.hxx | 2
svx/source/dialog/fontlb.cxx | 9
svx/source/dialog/svxbmpnumvalueset.cxx | 12
sw/Library_msword.mk | 3
sw/inc/crsrsh.hxx | 4
sw/inc/numrule.hxx | 1
sw/inc/swtable.hxx | 2
sw/source/core/crsr/crsrsh.cxx | 9
sw/source/core/crsr/trvltbl.cxx | 10
sw/source/core/doc/number.cxx | 7
sw/source/core/doc/tblrwcl.cxx | 93 ----
sw/source/core/table/swtable.cxx | 6
sw/source/filter/basflt/fltini.cxx | 146 ------
sw/source/filter/inc/fltini.hxx | 6
sw/source/filter/inc/wwstyles.hxx | 25 -
sw/source/filter/rtf/rtffld.cxx | 264 ------------
sw/source/filter/rtf/rtffly.cxx | 142 ------
sw/source/filter/rtf/rtfnum.cxx | 68 ---
sw/source/filter/rtf/swparrtf.cxx | 262 ------------
sw/source/filter/rtf/swparrtf.hxx | 225 ----------
sw/source/filter/ww8/styles.cxx | 14
sw/source/filter/ww8/writerhelper.cxx | 56 ++
sw/source/ui/inc/bookmark.hxx | 1
sw/source/ui/misc/bookmark.cxx | 9
sw/source/ui/vba/vbafield.cxx | 39 -
tools/inc/tools/resmgr.hxx | 1
tools/source/rc/resmgr.cxx | 5
unusedcode.easy | 13
vbahelper/inc/vbahelper/vbadocumentbase.hxx | 1
vbahelper/source/vbahelper/vbadocumentbase.cxx | 4
vcl/inc/vcl/window.hxx | 1
vcl/source/window/window.cxx | 7
52 files changed, 85 insertions(+), 2084 deletions(-)
New commits:
commit d0b590fe19b45e2248adff22c6fe61a4049a7db8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 8 18:09:45 2012 +0000
callcatcher: remove unused rtf filter and associated methods
update and remove newly unused code, mostly original rtf filter
Change-Id: I2dd302851ee6fad62d79fbc81cb8a61a861396db
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 8fee71e..22a0196 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/outliner/outlundo \
editeng/source/outliner/outlvw \
editeng/source/outliner/paralist \
- editeng/source/rtf/rtfgrf \
editeng/source/rtf/rtfitem \
editeng/source/rtf/svxrtf \
editeng/source/uno/unoedhlp \
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index 59336d4..84c00a2 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -99,44 +99,6 @@ struct SvxRTFStyleType
};
-// Bitmap - Mode
-typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > PictPropertyNameValuePairs;
-struct EDITENG_DLLPUBLIC SvxRTFPictureType
-{
- // Bitmap Format
- enum RTF_BMPSTYLE
- {
- RTF_BITMAP, // Meta data: Bitmap
- WIN_METAFILE, // Meta data: Window-Metafile
- MAC_QUICKDRAW, // Meta data: Mac-QuickDraw
- OS2_METAFILE, // Meta data: OS2-Metafile
- RTF_DI_BMP, // Meta data: Device Independent Bitmap
- ENHANCED_MF, // Meta data: Enhanced-Metafile
- RTF_PNG, // Meta data: PNG file
- RTF_JPG // Meta data: JPG file
- } eStyle;
-
- enum RTF_BMPMODE
- {
- BINARY_MODE,
- HEX_MODE
- } nMode;
-
- sal_uInt16 nType;
- sal_uInt32 uPicLen;
- sal_uInt16 nWidth, nHeight;
- sal_uInt16 nGoalWidth, nGoalHeight;
- sal_uInt16 nBitsPerPixel;
- sal_uInt16 nPlanes;
- sal_uInt16 nWidthBytes;
- sal_uInt16 nScalX, nScalY;
- short nCropT, nCropB, nCropL, nCropR;
- PictPropertyNameValuePairs aPropertyPairs;
- SvxRTFPictureType() { ResetValues(); }
- // Reset all values to default; is called after loading the Bitmap
- void ResetValues();
-};
-
// Here are the IDs for all character attributes, which can be detected by
// SvxParser and can be set in a SfxItemSet. The IDs are set correctly throught
// the SlotIds from POOL.
@@ -359,15 +321,6 @@ protected:
const String& GetBaseURL() const { return sBaseURL; }
- // Read the graphics data and make up for the graphics and the picture
- // meta data.
- // Return - sal_True: the graphic is valid
- sal_Bool ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType );
- // Change the ASCII-HexCodes into binary characters. If invalid data is
- // found (strings not 0-9 | a-f | A-F, then USHRT_MAX is returned,
- // otherwise the number of the converted character.
- xub_StrLen HexToBin( String& rToken );
-
public:
virtual SvParserState CallParser();
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 479b2f6..04622ca 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -36,20 +36,6 @@
using namespace com::sun::star;
-// Set all values to defaultt; is called after loading the bitmap!
-void SvxRTFPictureType::ResetValues()
-{ // Set all values RTF-Defaults
- eStyle = RTF_BITMAP;
- nMode = HEX_MODE;
- nType = nGoalWidth = nGoalHeight = 0;
- nWidth = nHeight = nWidthBytes = 0;
- uPicLen = 0;
- nBitsPerPixel = nPlanes = 1;
- nScalX = nScalY = 100; // Scale in percent
- nCropT = nCropB = nCropL = nCropR = 0;
- aPropertyPairs.clear();
-}
-
ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
: aSelection( rSel )
{
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
deleted file mode 100644
index 6d7bbcf..0000000
--- a/editeng/source/rtf/rtfgrf.cxx
+++ /dev/null
@@ -1,531 +0,0 @@
-/* -*- 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <boost/scoped_ptr.hpp>
-
-#include <osl/endian.h>
-#include <tools/cachestr.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <svtools/rtfkeywd.hxx>
-#include <svtools/rtftoken.h>
-#include <svtools/filter.hxx>
-#include <svtools/wmf.hxx>
-
-#include <editeng/svxrtf.hxx>
-
-#include <vector>
-
-using namespace ::rtl;
-
-static sal_uInt8 aPal1[ 2 * 4 ] = {
- 0x00, 0x00, 0x00, 0x00, // Black
- 0xFF, 0xFF, 0xFF, 0x00 // White
-};
-
-static sal_uInt8 aPal4[ 16 * 4 ] = {
- 0x00, 0x00, 0x00, 0x00,
- 0x80, 0x00, 0x00, 0x00,
- 0x00, 0x80, 0x00, 0x00,
- 0x80, 0x80, 0x00, 0x00,
- 0x00, 0x00, 0x80, 0x00,
- 0x80, 0x00, 0x80, 0x00,
- 0x00, 0x80, 0x80, 0x00,
- 0x80, 0x80, 0x80, 0x00,
- 0xC0, 0xC0, 0xC0, 0x00,
- 0xFF, 0x00, 0x00, 0x00,
- 0x00, 0xFF, 0x00, 0x00,
- 0xFF, 0xFF, 0x00, 0x00,
- 0x00, 0x00, 0xFF, 0x00,
- 0xFF, 0x00, 0xFF, 0x00,
- 0x00, 0xFF, 0xFF, 0x00,
- 0xFF, 0xFF, 0xFF, 0x00
-};
-
-static sal_uInt8 aPal8[ 256 * 4 ] =
-{
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00,
-0x80, 0x92, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x80, 0x00, 0xAA, 0x00,
-0x00, 0x92, 0xAA, 0x00, 0xC1, 0xC1, 0xC1, 0x00, 0xC9, 0xC9, 0xC9, 0x00,
-0xAA, 0xDB, 0xFF, 0x00, 0x00, 0x49, 0xAA, 0x00, 0x00, 0x49, 0xFF, 0x00,
-0x00, 0x6D, 0x00, 0x00, 0x00, 0x6D, 0x55, 0x00, 0x00, 0x6D, 0xAA, 0x00,
-0x00, 0x6D, 0xFF, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x92, 0x55, 0x00,
-0x00, 0x24, 0xAA, 0x00, 0x00, 0x92, 0xFF, 0x00, 0x00, 0xB6, 0x00, 0x00,
-0x00, 0xB6, 0x55, 0x00, 0x00, 0xB6, 0xAA, 0x00, 0x00, 0xB6, 0xFF, 0x00,
-0x00, 0xDB, 0x00, 0x00, 0x00, 0xDB, 0x55, 0x00, 0x00, 0xDB, 0xAA, 0x00,
-0x00, 0xDB, 0xFF, 0x00, 0xFF, 0xDB, 0xAA, 0x00, 0x00, 0xFF, 0x55, 0x00,
-0x00, 0xFF, 0xAA, 0x00, 0xFF, 0xFF, 0xAA, 0x00, 0x2B, 0x00, 0x00, 0x00,
-0x2B, 0x00, 0x55, 0x00, 0x2B, 0x00, 0xAA, 0x00, 0x2B, 0x00, 0xFF, 0x00,
-0x2B, 0x24, 0x00, 0x00, 0x2B, 0x24, 0x55, 0x00, 0x2B, 0x24, 0xAA, 0x00,
-0x2B, 0x24, 0xFF, 0x00, 0x2B, 0x49, 0x00, 0x00, 0x2B, 0x49, 0x55, 0x00,
-0x2B, 0x49, 0xAA, 0x00, 0x2B, 0x49, 0xFF, 0x00, 0x2B, 0x6D, 0x00, 0x00,
-0x2B, 0x6D, 0x55, 0x00, 0x2B, 0x6D, 0xAA, 0x00, 0x2B, 0x6D, 0xFF, 0x00,
-0x2B, 0x92, 0x00, 0x00, 0x2B, 0x92, 0x55, 0x00, 0x2B, 0x92, 0xAA, 0x00,
-0x2B, 0x92, 0xFF, 0x00, 0x2B, 0xB6, 0x00, 0x00, 0x2B, 0xB6, 0x55, 0x00,
-0x2B, 0xB6, 0xAA, 0x00, 0x2B, 0xB6, 0xFF, 0x00, 0x2B, 0xDB, 0x00, 0x00,
-0x2B, 0xDB, 0x55, 0x00, 0x2B, 0xDB, 0xAA, 0x00, 0x2B, 0xDB, 0xFF, 0x00,
-0x2B, 0xFF, 0x00, 0x00, 0x2B, 0xFF, 0x55, 0x00, 0x2B, 0xFF, 0xAA, 0x00,
-0x2B, 0xFF, 0xFF, 0x00, 0x55, 0x00, 0x00, 0x00, 0x55, 0x00, 0x55, 0x00,
-0x55, 0x00, 0xAA, 0x00, 0x55, 0x00, 0xFF, 0x00, 0x55, 0x24, 0x00, 0x00,
-0x55, 0x24, 0x55, 0x00, 0x55, 0x24, 0xAA, 0x00, 0x55, 0x24, 0xFF, 0x00,
-0x55, 0x49, 0x00, 0x00, 0x55, 0x49, 0x55, 0x00, 0x55, 0x49, 0xAA, 0x00,
-0x55, 0x49, 0xFF, 0x00, 0x55, 0x6D, 0x00, 0x00, 0x55, 0x6D, 0x55, 0x00,
-0x55, 0x6D, 0xAA, 0x00, 0x55, 0x6D, 0xFF, 0x00, 0x55, 0x92, 0x00, 0x00,
-0x55, 0x92, 0x55, 0x00, 0x55, 0x92, 0xAA, 0x00, 0x55, 0x92, 0xFF, 0x00,
-0x55, 0xB6, 0x00, 0x00, 0x55, 0xB6, 0x55, 0x00, 0x55, 0xB6, 0xAA, 0x00,
-0x55, 0xB6, 0xFF, 0x00, 0x55, 0xDB, 0x00, 0x00, 0x55, 0xDB, 0x55, 0x00,
-0x55, 0xDB, 0xAA, 0x00, 0x55, 0xDB, 0xFF, 0x00, 0x55, 0xFF, 0x00, 0x00,
-0x55, 0xFF, 0x55, 0x00, 0x55, 0xFF, 0xAA, 0x00, 0x55, 0xFF, 0xFF, 0x00,
-0x00, 0x00, 0x55, 0x00, 0x80, 0x00, 0x55, 0x00, 0x00, 0x24, 0x55, 0x00,
-0x80, 0x00, 0xFF, 0x00, 0x80, 0x24, 0x00, 0x00, 0x80, 0x24, 0x55, 0x00,
-0x80, 0x24, 0xAA, 0x00, 0x80, 0x24, 0xFF, 0x00, 0x80, 0x49, 0x00, 0x00,
-0x80, 0x49, 0x55, 0x00, 0x80, 0x49, 0xAA, 0x00, 0x80, 0x49, 0xFF, 0x00,
-0x80, 0x6D, 0x00, 0x00, 0x80, 0x6D, 0x55, 0x00, 0x80, 0x6D, 0xAA, 0x00,
-0x80, 0x6D, 0xFF, 0x00, 0x08, 0x08, 0x08, 0x00, 0x0F, 0x0F, 0x0F, 0x00,
-0x17, 0x17, 0x17, 0x00, 0x1F, 0x1F, 0x1F, 0x00, 0x27, 0x27, 0x27, 0x00,
-0x2E, 0x2E, 0x2E, 0x00, 0x36, 0x36, 0x36, 0x00, 0x3E, 0x3E, 0x3E, 0x00,
-0x46, 0x46, 0x46, 0x00, 0x4D, 0x4D, 0x4D, 0x00, 0x55, 0x55, 0x55, 0x00,
-0x5D, 0x5D, 0x5D, 0x00, 0x64, 0x64, 0x64, 0x00, 0x6C, 0x6C, 0x6C, 0x00,
-0x74, 0x74, 0x74, 0x00, 0x7C, 0x7C, 0x7C, 0x00, 0xFF, 0xDB, 0x00, 0x00,
-0x8B, 0x8B, 0x8B, 0x00, 0x93, 0x93, 0x93, 0x00, 0x9B, 0x9B, 0x9B, 0x00,
-0xFF, 0xB6, 0xFF, 0x00, 0xAA, 0xAA, 0xAA, 0x00, 0xB2, 0xB2, 0xB2, 0x00,
-0xB9, 0xB9, 0xB9, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00, 0x49, 0x00, 0x00,
-0xD1, 0xD1, 0xD1, 0x00, 0xD8, 0xD8, 0xD8, 0x00, 0xE0, 0xE0, 0xE0, 0x00,
-0xE8, 0xE8, 0xE8, 0x00, 0xF0, 0xF0, 0xF0, 0x00, 0xFF, 0xB6, 0xAA, 0x00,
-0xFF, 0xDB, 0xFF, 0x00, 0x80, 0x92, 0x55, 0x00, 0x80, 0x92, 0xAA, 0x00,
-0x80, 0x92, 0xFF, 0x00, 0x80, 0xB6, 0x00, 0x00, 0x80, 0xB6, 0x55, 0x00,
-0x80, 0xB6, 0xAA, 0x00, 0x80, 0xB6, 0xFF, 0x00, 0x80, 0xDB, 0x00, 0x00,
-0x80, 0xDB, 0x55, 0x00, 0x80, 0xDB, 0xAA, 0x00, 0x80, 0xDB, 0xFF, 0x00,
-0x80, 0xFF, 0x00, 0x00, 0x80, 0xFF, 0x55, 0x00, 0x80, 0xFF, 0xAA, 0x00,
-0x80, 0xFF, 0xFF, 0x00, 0xAA, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x55, 0x00,
-0xAA, 0x00, 0xAA, 0x00, 0xAA, 0x00, 0xFF, 0x00, 0xAA, 0x24, 0x00, 0x00,
-0xAA, 0x24, 0x55, 0x00, 0xAA, 0x24, 0xAA, 0x00, 0xAA, 0x24, 0xFF, 0x00,
-0xAA, 0x49, 0x00, 0x00, 0xAA, 0x49, 0x55, 0x00, 0xAA, 0x49, 0xAA, 0x00,
-0xAA, 0x49, 0xFF, 0x00, 0xAA, 0x6D, 0x00, 0x00, 0xAA, 0x6D, 0x55, 0x00,
-0xAA, 0x6D, 0xAA, 0x00, 0xAA, 0x6D, 0xFF, 0x00, 0xAA, 0x92, 0x00, 0x00,
-0xAA, 0x92, 0x55, 0x00, 0xAA, 0x92, 0xAA, 0x00, 0xAA, 0x92, 0xFF, 0x00,
-0xAA, 0xB6, 0x00, 0x00, 0xAA, 0xB6, 0x55, 0x00, 0xAA, 0xB6, 0xAA, 0x00,
-0xAA, 0xB6, 0xFF, 0x00, 0xAA, 0xDB, 0x00, 0x00, 0xAA, 0xDB, 0x55, 0x00,
-0xAA, 0xDB, 0xAA, 0x00, 0x00, 0x49, 0x55, 0x00, 0xAA, 0xFF, 0x00, 0x00,
-0xAA, 0xFF, 0x55, 0x00, 0xAA, 0xFF, 0xAA, 0x00, 0xAA, 0xFF, 0xFF, 0x00,
-0xD5, 0x00, 0x00, 0x00, 0xD5, 0x00, 0x55, 0x00, 0xD5, 0x00, 0xAA, 0x00,
-0xD5, 0x00, 0xFF, 0x00, 0xD5, 0x24, 0x00, 0x00, 0xD5, 0x24, 0x55, 0x00,
-0xD5, 0x24, 0xAA, 0x00, 0xD5, 0x24, 0xFF, 0x00, 0xD5, 0x49, 0x00, 0x00,
-0xD5, 0x49, 0x55, 0x00, 0xD5, 0x49, 0xAA, 0x00, 0xD5, 0x49, 0xFF, 0x00,
-0xD5, 0x6D, 0x00, 0x00, 0xD5, 0x6D, 0x55, 0x00, 0xD5, 0x6D, 0xAA, 0x00,
-0xD5, 0x6D, 0xFF, 0x00, 0xD5, 0x92, 0x00, 0x00, 0xD5, 0x92, 0x55, 0x00,
-0xD5, 0x92, 0xAA, 0x00, 0xD5, 0x92, 0xFF, 0x00, 0xD5, 0xB6, 0x00, 0x00,
-0xD5, 0xB6, 0x55, 0x00, 0xD5, 0xB6, 0xAA, 0x00, 0xD5, 0xB6, 0xFF, 0x00,
-0xD5, 0xDB, 0x00, 0x00, 0xD5, 0xDB, 0x55, 0x00, 0xD5, 0xDB, 0xAA, 0x00,
-0xD5, 0xDB, 0xFF, 0x00, 0xD5, 0xFF, 0x00, 0x00, 0xD5, 0xFF, 0x55, 0x00,
-0xD5, 0xFF, 0xAA, 0x00, 0xD5, 0xFF, 0xFF, 0x00, 0xFF, 0xDB, 0x55, 0x00,
-0xFF, 0x00, 0x55, 0x00, 0xFF, 0x00, 0xAA, 0x00, 0xFF, 0xFF, 0x55, 0x00,
-0xFF, 0x24, 0x00, 0x00, 0xFF, 0x24, 0x55, 0x00, 0xFF, 0x24, 0xAA, 0x00,
-0xFF, 0x24, 0xFF, 0x00, 0xFF, 0x49, 0x00, 0x00, 0xFF, 0x49, 0x55, 0x00,
-0xFF, 0x49, 0xAA, 0x00, 0xFF, 0x49, 0xFF, 0x00, 0xFF, 0x6D, 0x00, 0x00,
-0xFF, 0x6D, 0x55, 0x00, 0xFF, 0x6D, 0xAA, 0x00, 0xFF, 0x6D, 0xFF, 0x00,
-0xFF, 0x92, 0x00, 0x00, 0xFF, 0x92, 0x55, 0x00, 0xFF, 0x92, 0xAA, 0x00,
-0xFF, 0x92, 0xFF, 0x00, 0xFF, 0xB6, 0x00, 0x00, 0xFF, 0xB6, 0x55, 0x00,
-0xF7, 0xF7, 0xF7, 0x00, 0xA2, 0xA2, 0xA2, 0x00, 0x83, 0x83, 0x83, 0x00,
-0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00,
-0xFF, 0xFF, 0xFF, 0x00
-};
-
-
-
-
-inline sal_Int32 SwapDWord( sal_Int32 n )
-{
-#ifndef OSL_LITENDIAN
- return OSL_SWAPDWORD( n );
-#else
- return n;
-#endif
-}
-
-inline sal_Int16 SwapWord( sal_Int16 n )
-{
-#ifndef OSL_LITENDIAN
- return OSL_SWAPWORD( n );
-#else
- return n;
-#endif
-}
-
-
-static void WriteBMPHeader( SvStream& rStream,
- const SvxRTFPictureType& rPicType )
-{
- sal_uInt32 n4Width = rPicType.nWidth;
- sal_uInt32 n4Height = rPicType.nHeight;
- sal_uInt16 n4ColBits = rPicType.nBitsPerPixel;
-
- sal_uInt16 nColors = (1 << n4ColBits); // Number of colors (1, 16, 256)
- sal_uInt16 nWdtOut = rPicType.nWidthBytes;
- if( !nWdtOut )
- nWdtOut = (sal_uInt16)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
-
- sal_Int32 nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo);
- if( 256 >= nColors )
- nOffset += nColors * 4;
- sal_Int32 nSize = nOffset + nWdtOut * n4Height;
- rStream << "BM" // = "BM"
- << SwapDWord(nSize) // Filesize in Bytes
- << SwapWord(0) // Reserved
- << SwapWord(0) // Reserved
- << SwapDWord(nOffset); // Offset?
-
- rStream << SwapDWord(40) // sizeof( BmpInfo )
- << SwapDWord(n4Width)
- << SwapDWord(n4Height)
- << (sal_uInt16)1
- << n4ColBits
- << SwapDWord(0)
- << SwapDWord(0)
- << SwapDWord( rPicType.nGoalWidth
- ? rPicType.nGoalWidth * 1000L / 254L
- : 0 ) // DPI in Pixel per Meter
- << SwapDWord( rPicType.nGoalHeight
- ? rPicType.nGoalHeight * 1000L / 254L // dito
- : 0 )
- << SwapDWord(0)
- << SwapDWord(0);
-
-
- switch( rPicType.nBitsPerPixel )
- {
- case 1: rStream.Write( aPal1, sizeof( aPal1 )); break;
- case 4: rStream.Write( aPal4, sizeof( aPal4 )); break;
- case 8: rStream.Write( aPal8, sizeof( aPal8 )); break;
- }
-}
-
- // Converts the ASCII characters to hexadecimal codes in binary.
- // If invalid data is found (eg. characters outside 0-9|a-f|A-F), then
- // USHRT_MAX is returned, else the number of converted charachters.
-xub_StrLen SvxRTFParser::HexToBin( String& rToken )
-{
- // then create "Binary data" from the hex values.
- // (missuse the String as temp Buffer)
- if( rToken.Len() & 1 ) // odd number, fill out with 0
- rToken += '0';
-
- xub_StrLen n, nLen;
- sal_Unicode nVal;
- sal_Bool bValidData = sal_True;
- const sal_Unicode* pStr = rToken.GetBufferAccess();
- sal_Char* pData = (sal_Char*)pStr;
- for( n = 0, nLen = rToken.Len(); n < nLen; ++n, ++pStr )
- {
- if( ((nVal = *pStr) >= '0') && ( nVal <= '9') )
- nVal -= '0';
- else if( (nVal >= 'A') && (nVal <= 'F') )
- nVal -= 'A' - 10;
- else if( (nVal >= 'a') && (nVal <= 'f') )
- nVal -= 'a' - 10;
- else
- {
- DBG_ASSERT( !this, "invalid Hex value" );
- bValidData = sal_False;
- break;
- }
-
- if( n & 1 )
- *(pData++) |= nVal & 0x0f;
- else
- *(pData) = sal::static_int_cast< char >( ( nVal << 4 ) & 0xf0 );
- }
- // the len div 2, because 2 character are one byte
- return bValidData ? nLen / 2 : STRING_NOTFOUND;
-}
-
-sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
-{
- // Delete the old data
- rGrf.Clear();
-
- rtl_TextEncoding eOldEnc = GetSrcEncoding();
- SetSrcEncoding( RTL_TEXTENCODING_MS_1252 );
-
- const sal_Char* pFilterNm = 0;
- boost::scoped_ptr<SvCacheStream> pTmpFile;
-
- int nToken = 0;
- bool bValidBmp = true, bFirstTextToken = true;
- int _nOpenBrakets = 1, // the first was already recognized before!
- nValidDataBraket = 1;
-
- if( RTF_SHPPICT == GetStackPtr(0)->nTokenId )
- ++nValidDataBraket;
- OUString sShapePropertyName, sShapePropertyValue;
- int nShapePropertyBracket = -1;
- while( _nOpenBrakets && IsParserWorking() && bValidBmp )
- {
- nToken = GetNextToken();
- sal_uInt16 nVal = sal_uInt16( nTokenValue );
- switch( nToken )
- {
- case '}':
- --_nOpenBrakets;
- if( nShapePropertyBracket > 0 && nShapePropertyBracket > _nOpenBrakets )
- {
- nShapePropertyBracket = -1;
- if( !sShapePropertyName.isEmpty() )
- {
- rPicType.aPropertyPairs.push_back( ::std::pair< OUString, OUString >( sShapePropertyName, sShapePropertyValue ) );
- sShapePropertyName = sShapePropertyValue = ::rtl::OUString();
- }
- }
- break;
- case '{':
- {
- if( RTF_IGNOREFLAG != GetNextToken() )
- nToken = SkipToken( -1 );
- else if( RTF_UNKNOWNCONTROL != GetNextToken() )
- nToken = SkipToken( -2 );
- else
- {
- // gleich herausfiltern
- ReadUnknownData();
- nToken = GetNextToken();
- if( '}' != nToken )
- eState = SVPAR_ERROR;
- break;
- }
- ++_nOpenBrakets;
- }
- break;
-
- case RTF_MACPICT:
- {
- rPicType.eStyle = SvxRTFPictureType::MAC_QUICKDRAW;
- // Mac-Pict gets a empty header above
- pTmpFile.reset(new SvCacheStream);
- std::vector<char> a512Zeros(512, '\0');
- pTmpFile->Write( &a512Zeros[0], a512Zeros.size() );
- pFilterNm = "PCT";
- }
- break;
-
- case RTF_EMFBLIP:
- case RTF_WMETAFILE:
- case RTF_PNGBLIP:
- case RTF_JPEGBLIP:
- case RTF_WBITMAP:
- case RTF_OSMETAFILE:
- case RTF_DIBITMAP:
- {
- switch( nToken )
- {
- case RTF_EMFBLIP:
- rPicType.eStyle = SvxRTFPictureType::ENHANCED_MF;
- pFilterNm = "EMF";
- break;
- case RTF_WMETAFILE:
- rPicType.eStyle = SvxRTFPictureType::WIN_METAFILE;
- pFilterNm = "WMF";
- break;
- case RTF_PNGBLIP:
- rPicType.eStyle = SvxRTFPictureType::RTF_PNG;
- pFilterNm = "PNG";
- break;
- case RTF_JPEGBLIP:
- rPicType.eStyle = SvxRTFPictureType::RTF_JPG;
- pFilterNm = "JPG";
- break;
-
- case RTF_WBITMAP:
- rPicType.eStyle = SvxRTFPictureType::RTF_BITMAP;
- break;
- case RTF_OSMETAFILE:
- rPicType.eStyle = SvxRTFPictureType::OS2_METAFILE;
- break;
- case RTF_DIBITMAP:
- rPicType.eStyle = SvxRTFPictureType::RTF_DI_BMP;
- break;
- }
-
- rPicType.nType = nVal;
- pTmpFile.reset(new SvCacheStream);
- }
- break;
-
- case RTF_PICW: rPicType.nWidth = nVal; break;
- case RTF_PICH: rPicType.nHeight = nVal; break;
- case RTF_WBMBITSPIXEL: rPicType.nBitsPerPixel = nVal; break;
- case RTF_WBMPLANES: rPicType.nPlanes = nVal; break;
- case RTF_WBMWIDTHBYTES: rPicType.nWidthBytes = nVal; break;
- case RTF_PICWGOAL: rPicType.nGoalWidth = nVal; break;
- case RTF_PICHGOAL: rPicType.nGoalHeight = nVal; break;
- case RTF_BIN:
- rPicType.nMode = SvxRTFPictureType::BINARY_MODE;
- rPicType.uPicLen = nTokenValue;
- if (rPicType.uPicLen)
- {
- rStrm.SeekRel(-1);
- sal_uInt8 aData[4096];
- sal_uInt32 nSize = sizeof(aData);
-
- while (rPicType.uPicLen > 0)
- {
- if (rPicType.uPicLen < nSize)
- nSize = rPicType.uPicLen;
-
- rStrm.Read(aData, nSize);
- pTmpFile->Write(aData, nSize);
- rPicType.uPicLen -= nSize;
- }
- nNextCh = GetNextChar();
- bValidBmp = !pTmpFile->GetError();
- }
- break;
- case RTF_PICSCALEX: rPicType.nScalX = nVal; break;
- case RTF_PICSCALEY: rPicType.nScalY = nVal; break;
- case RTF_PICSCALED: break;
-
- case RTF_PICCROPT: rPicType.nCropT = (short)nTokenValue; break;
- case RTF_PICCROPB: rPicType.nCropB = (short)nTokenValue; break;
- case RTF_PICCROPL: rPicType.nCropL = (short)nTokenValue; break;
- case RTF_PICCROPR: rPicType.nCropR = (short)nTokenValue; break;
- case RTF_SP:
- //read pairs of {\sn Name}{\sv Value}
- nShapePropertyBracket = _nOpenBrakets;
- break;
- case RTF_SN:
- nToken = GetNextToken();
- if( nToken != '}' )
- sShapePropertyName = aToken;
- else
- nToken = SkipToken( -1 );
- break;
- case RTF_SV:
- nToken = GetNextToken();
- if( nToken != '}' )
- sShapePropertyValue = aToken;
- else
- nToken = SkipToken( -1 );
- break;
- case RTF_TEXTTOKEN:
- if( nValidDataBraket != _nOpenBrakets )
- break;
-
- if( bFirstTextToken )
- {
- switch( rPicType.eStyle )
- {
- case SvxRTFPictureType::RTF_BITMAP:
- // first write the header and the info structure
- if( pTmpFile )
- ::WriteBMPHeader( *pTmpFile, rPicType );
- break;
- default:
- break;
- }
- bFirstTextToken = sal_False;
- }
-
- if( pTmpFile && SvxRTFPictureType::HEX_MODE == rPicType.nMode )
- {
- xub_StrLen nTokenLen = HexToBin( aToken );
- if( STRING_NOTFOUND == nTokenLen )
- bValidBmp = sal_False;
- else
- {
- pTmpFile->Write( (sal_Char*)aToken.GetBuffer(),
- nTokenLen );
- bValidBmp = 0 == pTmpFile->GetError();
- }
- }
- break;
- }
- }
-
- if (pTmpFile)
- {
- //#i20775#
- if (pTmpFile->Tell() == 0)
- bValidBmp = false;
-
- if( bValidBmp )
- {
- GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
- sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW;
-
- if( pFilterNm )
- {
- String sTmp;
- for( sal_uInt16 n = rGF.GetImportFormatCount(); n; )
- {
- sTmp = rGF.GetImportFormatShortName( --n );
- if( sTmp.EqualsAscii( pFilterNm ))
- {
- nImportFilter = n;
- break;
- }
- }
- }
-
- String sTmpStr;
- pTmpFile->Seek( STREAM_SEEK_TO_BEGIN );
- bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter );
- }
- }
-
- if( !bValidBmp )
- {
- rGrf.Clear();
- // TODO: If nToken were not initialized to 0 above, it would potentially
- // be used uninitialized here (if IsParserWorking() is false at the
- // start of the while loop above):
- if( '}' != nToken )
- SkipGroup();
- }
- else
- {
- switch( rPicType.eStyle )
- {
- case SvxRTFPictureType::RTF_PNG:
- case SvxRTFPictureType::RTF_JPG:
- {
- const MapMode aMap( MAP_100TH_MM );
- Size aSize( rGrf.GetPrefSize() );
- if( MAP_PIXEL == rGrf.GetPrefMapMode().GetMapUnit() )
- aSize = Application::GetDefaultDevice()->PixelToLogic(
- aSize, aMap );
- else
- aSize = OutputDevice::LogicToLogic( aSize,
- rGrf.GetPrefMapMode(), aMap );
- rPicType.nWidth = sal::static_int_cast< sal_uInt16 >(aSize.Width());
- rPicType.nHeight = sal::static_int_cast< sal_uInt16 >(
- aSize.Height());
- }
- break;
- default:
- break;
- }
- }
- SetSrcEncoding( eOldEnc );
-
- SkipToken( -1 ); // the closing brace is evaluated "above"
- return bValidBmp;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index af94c17..35da167 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -304,7 +304,6 @@ private:
public:
ParserQueue* pParseQueue; // public ?
static rtl::OString sLanguages; // public ?
- static rtl::OString sForcedLanguages; // public ?
static bool handleArguments(int argc, char * argv[], HandledArgs& o_aHandledArgs);
static void writeUsage(const OString& rName, const OString& rFileType);
@@ -312,7 +311,6 @@ public:
static void InitLanguages( bool bMergeMode = false );
static void InitForcedLanguages( bool bMergeMode = false );
static std::vector<rtl::OString> GetLanguages();
- static std::vector<rtl::OString> GetForcedLanguages();
static void SetLanguages( std::vector<rtl::OString> val );
static void RemoveUTF8ByteOrderMarker( rtl::OString &rString );
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 5ef2231..0ef5ca4 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -88,7 +88,6 @@ ResData::~ResData()
/*****************************************************************************/
rtl::OString Export::sLanguages;
-rtl::OString Export::sForcedLanguages;
/*****************************************************************************/
bool Export::handleArguments(
@@ -204,11 +203,6 @@ std::vector<rtl::OString> Export::GetLanguages(){
/*****************************************************************************/
return aLanguages;
}
-/*****************************************************************************/
-std::vector<rtl::OString> Export::GetForcedLanguages(){
-/*****************************************************************************/
- return aForcedLanguages;
-}
std::vector<rtl::OString> Export::aLanguages = std::vector<rtl::OString>();
std::vector<rtl::OString> Export::aForcedLanguages = std::vector<rtl::OString>();
@@ -337,27 +331,8 @@ void Export::InitLanguages( bool bMergeMode ){
}
while ( nIndex >= 0 );
- InitForcedLanguages( bMergeMode );
isInitialized = true;
}
}
-/*****************************************************************************/
-void Export::InitForcedLanguages( bool bMergeMode ){
-/*****************************************************************************/
- rtl::OString sTmp;
- OStringBoolHashMap aEnvLangs;
-
- sal_Int32 nIndex = 0;
- do
- {
- rtl::OString aToken = sForcedLanguages.getToken(0, ',', nIndex);
-
- sTmp = aToken.getToken(0, '=').trim();
- if( bMergeMode && isAllowed( sTmp ) ){}
- else if( !( (sTmp[0]=='x' || sTmp[0]=='X') && sTmp[1]=='-' ) )
- aForcedLanguages.push_back( sTmp );
- }
- while ( nIndex >= 0 );
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index a77313e..9cd31f6 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -531,18 +531,6 @@ void ScDPFieldControlBase::FieldFocusChanged(size_t nOldSelected, size_t nFieldS
xRef->FieldFocusChange(nOldSelected, nFieldSelected);
}
-void ScDPFieldControlBase::AccessibleSetFocus(bool bOn)
-{
- AccessRef xRef( mxAccessible );
- if ( !xRef.is() )
- return;
-
- if (bOn)
- xRef->GotFocus();
- else
- xRef->LostFocus();
-}
-
void ScDPFieldControlBase::UpdateStyle()
{
WinBits nMask = ~(WB_TABSTOP | WB_NOTABSTOP);
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index 0e7d42e..589650d 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -173,7 +173,6 @@ protected:
::com::sun::star::accessibility::XAccessible > CreateAccessible();
void FieldFocusChanged(size_t nOldSelected, size_t nFieldSelected);
- void AccessibleSetFocus(bool bOn);
/** Updates the tab stop style bits. */
void UpdateStyle();
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 71b98c5..2a87035 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -160,16 +160,6 @@ ScVbaWorkbook::init()
if ( !ColorData.getLength() )
ResetColors();
}
-ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
-{
- //#FIXME this persists the color data per office instance and
- // not per workbook instance, need to hook the data into XModel
- // ( e.g. we already store the imported palette in there )
- // so we should,
- // a) make the class that does that a service
- // b) make that service implement XIndexContainer
- init();
-}
ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
{
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index f17ef3c..6a8f02c 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -32,9 +32,6 @@ class ScVbaWorkbook : public ScVbaWorkbook_BASE
void initColorData( const css::uno::Sequence< sal_Int32 >& sColors );
void init();
-protected:
-
- ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
public:
ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::frame::XModel > xModel );
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 88f1c6d..fffbf29 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -773,11 +773,6 @@ void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData)
maUserData.push_back(rpData);
}
-void SdTransferable::RemoveUserData (const ::boost::shared_ptr<UserData>& rpData)
-{
- maUserData.erase(::std::find(maUserData.begin(), maUserData.end(), rpData));
-}
-
sal_Int32 SdTransferable::GetUserDataCount (void) const
{
return maUserData.size();
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 080c304..66e3634 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -96,11 +96,6 @@ public:
*/
void AddUserData (const ::boost::shared_ptr<UserData>& rpData);
- /** Remove a previously added user data object. When the object
- was never added or removed before then this call is ignored.
- */
- void RemoveUserData (const ::boost::shared_ptr<UserData>& rpData);
-
/** Return the number of user data objects.
*/
sal_Int32 GetUserDataCount (void) const;
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 6a2a001..7d29a14 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -115,7 +115,7 @@ private:
SvTreeListEntry* pParent, SvTreeListEntry* pEntry = 0 ) const;
sal_uInt16 GetLevelCount_Impl( SvTreeListEntry* pParent ) const;
- SvTreeListEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
+ SvTreeListEntry* InsertEntryByBmpType( const OUString& rText, BMPTYPE eBmpType,
SvTreeListEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False,
sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
};
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index f086469..18da272 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1261,7 +1261,7 @@ sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvTreeListEntry* pParent)
//-------------------------------------------------------------------------
SvTreeListEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
- const XubString& rText,
+ const OUString& rText,
BMPTYPE eBmpType,
SvTreeListEntry* pParent,
sal_Bool bChildrenOnDemand,
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index b20d89c..b7e6949 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -518,10 +518,6 @@ public:
OUString& sOutString, Color** ppColor,
LanguageType eLnge = LANGUAGE_DONTKNOW );
- bool GetPreviewString( const String& sFormatString, const String& sPreviewString,
- String& sOutString, Color** ppColor,
- LanguageType eLnge = LANGUAGE_DONTKNOW );
-
/** Test whether the format code string is already present in container
@return
NUMBERFORMAT_ENTRY_NOT_FOUND if not found, else the format index.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0440835..482dee3 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1729,20 +1729,6 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString,
return false;
}
-bool SvNumberFormatter::GetPreviewString( const String& sFormatString,
- const String& sPreviewString,
- String& sOutString,
- Color** ppColor,
- LanguageType eLnge )
-{
- bool result;
- OUString sTemp(sOutString);
- result = GetPreviewString( OUString(sFormatString), OUString(sPreviewString),
- sTemp, ppColor, eLnge );
- sOutString = sTemp;
- return result;
-}
-
bool SvNumberFormatter::GetPreviewString( const OUString& sFormatString,
const OUString& sPreviewString,
OUString& sOutString,
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index fb1a0ae..eca0aeb 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -430,7 +430,6 @@ public:
sal_Bool SwapOut();
sal_Bool SwapOut( SvStream* pOStm );
sal_Bool SwapIn();
- sal_Bool SwapIn( SvStream* pIStm );
sal_Bool IsInSwapIn() const { return mbIsInSwapIn; }
sal_Bool IsInSwapOut() const { return mbIsInSwapOut; }
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 6ca4d7d..438c2df 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1038,31 +1038,6 @@ sal_Bool GraphicObject::SwapIn()
return bRet;
}
-sal_Bool GraphicObject::SwapIn( SvStream* pIStm )
-{
- sal_Bool bRet;
-
- if( mbAutoSwapped )
- {
- ImplAutoSwapIn();
- bRet = sal_True;
- }
- else if( mpMgr && mpMgr->ImplFillSwappedGraphicObject( *this, maGraphic ) )
- bRet = sal_True;
- else
- {
- bRet = maGraphic.SwapIn( pIStm );
-
- if( bRet && mpMgr )
- mpMgr->ImplGraphicObjectWasSwappedIn( *this );
- }
-
- if( bRet )
- ImplAssignGraphicData();
-
- return bRet;
-}
-
void GraphicObject::SetSwapState()
{
if( !IsSwappedOut() )
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index c97df39..b45ed08 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -70,8 +70,7 @@ private:
bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry().
public:
- SvxFontListBox(Window* pParent, const ResId& rResId);
- SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER);
+ SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER);
/** Inserts a list entry and sets the font used for this entry.
@param pColor The font color. NULL = use default listbox text color. */
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 030f023..ce39279 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -69,7 +69,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
public:
SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
- SvxNumValueSet( Window* pParent, WinBits nWinStyle, sal_uInt16 nType );
~SvxNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
@@ -108,7 +107,6 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
public:
SvxBmpNumValueSet(Window* pParent, const ResId& rResId);
- SvxBmpNumValueSet(Window* pParent, WinBits nWinStyle);
~SvxBmpNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 1ac29f4..1e6ceb8 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -88,15 +88,6 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt
// ============================================================================
-SvxFontListBox::SvxFontListBox(Window* pParent, const ResId& rResId)
- : SvTabListBox(pParent, rResId)
- , maStdFont(GetFont())
- , mbUseFont(false)
-{
- maStdFont.SetTransparent(sal_True);
- maEntryFont = maStdFont;
-}
-
SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
, maStdFont(GetFont())
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 960f8d1..d521773 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -399,12 +399,6 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16
init(nType);
}
-SvxNumValueSet::SvxNumValueSet( Window* pParent, WinBits nWinStyle, sal_uInt16 nType )
- : ValueSet( pParent, nWinStyle )
-{
- init(nType);
-}
-
void SvxNumValueSet::init(sal_uInt16 nType)
{
aLineColor = COL_LIGHTGRAY;
@@ -472,12 +466,6 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId )
init();
}
-SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, WinBits nWinStyle )
- : SvxNumValueSet( pParent, nWinStyle, NUM_PAGETYPE_BMP )
-{
- init();
-}
-
void SvxBmpNumValueSet::init()
{
bGrfNotFound = sal_False;
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index c808dcf..cae89b5 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -67,9 +67,6 @@ $(eval $(call gb_Library_use_externals,msword,\
))
$(eval $(call gb_Library_add_exception_objects,msword,\
- sw/source/filter/rtf/rtffld \
- sw/source/filter/rtf/rtffly \
- sw/source/filter/rtf/rtfnum \
sw/source/filter/rtf/swparrtf \
sw/source/filter/ww8/docxattributeoutput \
sw/source/filter/ww8/docxexport \
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 6d47927..ababf91 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -483,9 +483,6 @@ public:
void SetReadOnlyAvailable( sal_Bool bFlag );
sal_Bool IsOverReadOnlyPos( const Point& rPt ) const;
- /// Is the rPt point in the header or footer area?
- sal_Bool IsOverHeaderFooterPos( const Point& rPt ) const;
-
// Methods for aFlyMacroLnk.
void SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; }
const Link& GetFlyMacroLnk() const { return aFlyMacroLnk; }
@@ -585,7 +582,6 @@ public:
inline const SwPaM* GetTblCrs() const;
inline SwPaM* GetTblCrs();
- bool IsTblComplex() const;
bool IsTblComplexForChart();
// get current table selection as text
String GetBoxNms() const;
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 1fe43ba..3b468ef 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -72,7 +72,6 @@ public:
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
void SetCharFmt( SwCharFmt* );
- void ForgetCharFmt();
virtual void SetCharFmtName(const String& rSet);
virtual const String& GetCharFmtName()const;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 741e096..81f2696 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -242,7 +242,6 @@ public:
sal_uInt16 nCnt = 1, bool bBehind = true );
bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes,
sal_uInt16 nCnt = 1, bool bBehind = true );
- bool AppendRow( SwDoc* pDoc, sal_uInt16 nCnt = 1 );
void PrepareDelBoxes( const SwSelBoxes& rBoxes );
bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
@@ -478,7 +477,6 @@ public:
sal_uInt16 nMaxStep = USHRT_MAX ) const
{ return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); }
void RegisterToFormat( SwFmt& rFmt ) ;
- void ForgetFrmFmt();
};
class SwCellFrm;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 3486a74..a87677f 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2289,15 +2289,6 @@ sal_Bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
return aPam.HasReadonlySel( GetViewOptions()->IsFormView() );
}
-sal_Bool SwCrsrShell::IsOverHeaderFooterPos( const Point& rPt ) const
-{
- Point aPt( rPt );
- SwPaM aPam( *pCurCrsr->GetPoint() );
- GetLayout()->GetCrsrOfst( aPam.GetPoint(), aPt );
-
- return GetDoc()->IsInHeaderFooter( aPam.GetPoint()->nNode );
-}
-
/** Get the number of elements in the ring of cursors
@param bAll If <false> get only spanned ones (= with selections) (Basic).
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 816a48b..5c424f5 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -696,16 +696,6 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
return bRet;
}
-
-bool SwCrsrShell::IsTblComplex() const
-{
- SwFrm *pFrm = GetCurrFrm( sal_False );
- if ( pFrm && pFrm->IsInTab() )
- return pFrm->FindTabFrm()->GetTable()->IsTblComplex();
- return false;
-}
-
-
bool SwCrsrShell::IsTblComplexForChart()
{
bool bRet = false;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 91b822b..36426c7 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -316,13 +316,6 @@ const String& SwNumFmt::GetCharFmtName() const
return aEmptyStr;
}
-void SwNumFmt::ForgetCharFmt()
-{
- if ( GetRegisteredIn() )
- GetRegisteredInNonConst()->Remove( this );
-}
-
-
void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
const sal_Int16* pOrient)
{
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 65af1e5..9818bde 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -665,99 +665,6 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
return true;
}
-void _FndBoxAppendRowLine( SwTableLine* pLine, _FndPara* pFndPara );
-
-static void _FndBoxAppendRowBox( SwTableBox* pBox, _FndPara* pFndPara )
-{
- _FndBox* pFndBox = new _FndBox( pBox, pFndPara->pFndLine );
- if( pBox->GetTabLines().size() )
- {
- _FndPara aPara( *pFndPara, pFndBox );
- BOOST_FOREACH( SwTableLine* pLine, pFndBox->GetBox()->GetTabLines() )
- _FndBoxAppendRowLine( pLine, &aPara );
- if( pFndBox->GetLines().empty() )
- delete pFndBox;
- }
- else
- pFndPara->pFndLine->GetBoxes().push_back( pFndBox );
-}
-
-void _FndBoxAppendRowLine( SwTableLine* pLine, _FndPara* pFndPara )
-{
- _FndLine* pFndLine = new _FndLine( pLine, pFndPara->pFndBox );
- _FndPara aPara( *pFndPara, pFndLine );
- for( SwTableBoxes::iterator it = pFndLine->GetLine()->GetTabBoxes().begin();
- it != pFndLine->GetLine()->GetTabBoxes().end(); ++it)
- _FndBoxAppendRowBox(*it, &aPara );
- if( pFndLine->GetBoxes().size() )
- {
- pFndPara->pFndBox->GetLines().push_back( pFndLine );
- }
- else
- delete pFndLine;
-}
-
-bool SwTable::AppendRow( SwDoc* pDoc, sal_uInt16 nCnt )
-{
- SwTableNode *const pTblNd = const_cast<SwTableNode*>(
- m_TabSortContentBoxes[0]->GetSttNd()->FindTableNode());
- if( !pTblNd )
- return false;
-
- // Find all Boxes/Lines
- _FndBox aFndBox( 0, 0 );
- {
- SwTableLine* pLLine = GetTabLines().back();
-
- const SwSelBoxes* pBxs = 0; // Dummy!!!
- _FndPara aPara( *pBxs, &aFndBox );
-
- _FndBoxAppendRowLine(pLLine, &aPara);
- }
- if( aFndBox.GetLines().empty() )
- return false;
-
- SetHTMLTableLayout( 0 ); // Delete HTML Layout
-
- // Find Lines for the Layout update
- bool bLayout = 0 != SwIterator<SwTabFrm,SwFmt>::FirstElement( *GetFrmFmt() );
- if( bLayout )
- {
- aFndBox.SetTableLines( *this );
- // TL_CHART2: nothing to be done since chart2 currently does not want to
- // get notified about new rows/cols.
- }
-
- _CpyTabFrms aTabFrmArr;
- _CpyPara aCpyPara( pTblNd, 0, aTabFrmArr );
- aCpyPara.nInsPos = GetTabLines().size();
- aCpyPara.nDelBorderFlag = 1;
-
- for( sal_uInt16 nCpyCnt = 0; nCpyCnt < nCnt; ++nCpyCnt )
- {
- aCpyPara.nDelBorderFlag = 1;
- BOOST_FOREACH( _FndLine& rFndLine, aFndBox.GetLines() )
- lcl_CopyRow( rFndLine, &aCpyPara );
- }
-
- // Clean up this Line's structure once again, generally all of them
- if( !pDoc->IsInReading() )
- GCLines();
-
- // Update Layout
- if ( bLayout )
- {
- aFndBox.MakeNewFrms( *this, nCnt, sal_True );
- }
- // TL_CHART2: need to inform chart of probably changed cell names
- pDoc->UpdateCharts( GetFrmFmt()->GetName() );
-
- CHECKBOXWIDTH;
- CHECKTABLELAYOUT;
-
- return true;
-}
-
static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
bool bFirst, SwShareBoxFmts& rShareFmts );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index c37ff85..466ed90 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2796,12 +2796,6 @@ void SwTableBox::RegisterToFormat( SwFmt& rFmt )
rFmt.Add( this );
}
-void SwTableBox::ForgetFrmFmt()
-{
- if ( GetRegisteredIn() )
- GetRegisteredInNonConst()->Remove(this);
-}
-
// free's any remaining child objects
SwTableLines::~SwTableLines()
{
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 6df6cd7..8664fa4 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -330,152 +330,6 @@ SwRelNumRuleSpaces::~SwRelNumRuleSpaces()
}
}
-void SwRelNumRuleSpaces::SetNumRelSpaces( SwDoc& rDoc )
-{
- const SwNumRuleTbl* pRuleTbl = NULL;
-
- if( !bNewDoc )
- {
- // jetzt alle schon vorhanden NumRules aus dem Array entfernen,
- // damit nur die neuen angepasst werden
- SwNumRuleTbl aNumRuleTbl;
- aNumRuleTbl.insert( aNumRuleTbl.begin(), pNumRuleTbl->begin(), pNumRuleTbl->end() );
- pNumRuleTbl->clear();
- const SwNumRuleTbl& rRuleTbl = rDoc.GetNumRuleTbl();
- SwNumRule* pRule;
-
- for( sal_uInt16 n = 0; n < rRuleTbl.size(); ++n )
- if( USHRT_MAX == aNumRuleTbl.GetPos( pRule = rRuleTbl[ n ] ))
- // war noch nicht vorhanden, also neu
- pNumRuleTbl->push_back( pRule );
-
- aNumRuleTbl.clear();
-
- pRuleTbl = pNumRuleTbl;
- }
- else
- {
- pRuleTbl = &rDoc.GetNumRuleTbl();
- }
-
- if( pRuleTbl )
- {
- for( sal_uInt16 n = pRuleTbl->size(); n; )
- {
- SwNumRule* pRule = (*pRuleTbl)[ --n ];
- // Rule noch gueltig und am Doc vorhanden?
- if( USHRT_MAX != rDoc.GetNumRuleTbl().GetPos( pRule ))
- {
- SwNumRule::tTxtNodeList aTxtNodeList;
- pRule->GetTxtNodeList( aTxtNodeList );
- for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
- aIter != aTxtNodeList.end(); ++aIter )
- {
- SwTxtNode* pNd = *aIter;
- SetNumLSpace( *pNd, *pRule );
- }
- }
- }
- }
-
- if( pNumRuleTbl )
- {
- pNumRuleTbl->clear();
- delete pNumRuleTbl, pNumRuleTbl = 0;
- }
-
- if( bNewDoc )
- {
- SetOultineRelSpaces( SwNodeIndex( rDoc.GetNodes() ),
- SwNodeIndex( rDoc.GetNodes().GetEndOfContent()));
- }
-}
-
-void SwRelNumRuleSpaces::SetOultineRelSpaces( const SwNodeIndex& rStt,
- const SwNodeIndex& rEnd )
-{
- SwDoc* pDoc = rStt.GetNode().GetDoc();
- const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
- if( !rOutlNds.empty() )
- {
- sal_uInt16 nPos;
- rOutlNds.Seek_Entry( &rStt.GetNode(), &nPos );
- for( ; nPos < rOutlNds.size() &&
- rOutlNds[ nPos ]->GetIndex() < rEnd.GetIndex(); ++nPos )
- {
- SwTxtNode* pNd = rOutlNds[ nPos ]->GetTxtNode();
- if( pNd->IsOutline() && !pNd->GetNumRule() )
- SetNumLSpace( *pNd, *pDoc->GetOutlineNumRule() );
- }
- }
-}
-
-void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
-{
- sal_Bool bOutlineRule = OUTLINE_RULE == rRule.GetRuleType();
- // correction of refactoring done by cws swnumtree:
- // - assure a correct level for retrieving numbering format.
- sal_uInt8 nLvl = 0;
- if ( rNd.GetActualListLevel() >= 0 && rNd.GetActualListLevel() < MAXLEVEL )
- {
- nLvl = static_cast< sal_uInt8 >(rNd.GetActualListLevel());
- }
-
- const SwNumFmt& rFmt = rRule.Get( nLvl );
- const SvxLRSpaceItem& rLR = rNd.GetSwAttrSet().GetLRSpace();
-
- SvxLRSpaceItem aLR( rLR );
- aLR.SetTxtFirstLineOfst( 0 );
-
- // sagt der Node, das die Numerierung den Wert vorgibt?
- if( !bOutlineRule && rNd.IsSetNumLSpace() )
- aLR.SetTxtLeft( 0 );
- else
- {
- long nLeft = rFmt.GetAbsLSpace(), nParaLeft = rLR.GetTxtLeft();
- if( 0 < rLR.GetTxtFirstLineOfst() )
- nParaLeft += rLR.GetTxtFirstLineOfst();
- else if( nParaLeft >= nLeft )
- // set correct paragraph indent
- nParaLeft -= nLeft;
- else
- nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst();
- aLR.SetTxtLeft( nParaLeft );
- }
-
- if( aLR.GetTxtLeft() != rLR.GetTxtLeft() )
- {
- //bevor rLR geloescht wird!
- long nOffset = rLR.GetTxtLeft() - aLR.GetTxtLeft();
- rNd.SetAttr( aLR );
-
- // Tabs anpassen !!
- const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(
- RES_PARATR_TABSTOP, sal_True, &pItem ))
- {
- SvxTabStopItem aTStop( *(SvxTabStopItem*)pItem );
- for( sal_uInt16 n = 0; n < aTStop.Count(); ++n )
- {
- SvxTabStop& rTab = (SvxTabStop&)aTStop[ n ];
- if( SVX_TAB_ADJUST_DEFAULT != rTab.GetAdjustment() )
- {
- if( !rTab.GetTabPos() )
- {
- aTStop.Remove( n );
- --n;
- }
- else
- rTab.GetTabPos() += nOffset;
- }
- }
- rNd.SetAttr( aTStop );
- }
- }
-}
-
-
-
void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
SwTwips nPageWidth)
{
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index b3758cd..55c9f88 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -73,15 +73,9 @@ class SW_DLLPUBLIC SwRelNumRuleSpaces
SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
sal_Bool bNewDoc;
- void SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule );
-
public:
SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNewDoc );
~SwRelNumRuleSpaces();
-
- void SetNumRelSpaces( SwDoc& rDoc );
- void SetOultineRelSpaces( const SwNodeIndex& rStt,
- const SwNodeIndex& rEnd );
};
#define SW_SV_BRUSH_25 0
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 2cbc618..1e2539a 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -135,31 +135,6 @@ namespace ww
stiNil = 0x0fff // max for 12 bits
};
- /** Find the WinWord sti index of an english style name.
-
- When importing a RTF document we would like to treat styles as similiar
- to how word does as possible, to this end word will treat some styles
- with special names as inbuilt styles, and some as user defined styles.
-
- See OpenOffice.org issue 21881
- (http://www.openoffice.org/issues/show_bug.cgi?id=21881)
- and OpenOffice.org issue 17503
- (http://www.openoffice.org/issues/show_bug.cgi?id=17503)
-
- @param
- rSting the Style name to test to see what winword sti word would give
- such a name if it has no other information to work with (e.g. importing
- a RTF document)
-
- @return the sti that word would give it. stiUser if word would treat
- it as a user defined style.
-
- @author
- <a href="mailto:cmc at openoffice.org">Caolán McNamara</a>
- <a href="mailto:tono at openoffice.org">Takashi Ono</a>
- */
- sti GetCanonicalStiFromEnglishName(const String &rString) throw();
-
/** Find the WinWord sti index of an old <= Word2 stc (style code)
When importing a Word 2 document we would like to treat styles as
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
deleted file mode 100644
index 6afe166..0000000
--- a/sw/source/filter/rtf/rtffld.cxx
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <ctype.h>
-#include <hintids.hxx>
-
-#include <sal/macros.h>
-#include <com/sun/star/i18n/ScriptType.hpp>
-#include <comphelper/string.hxx>
-#include <vcl/graph.hxx>
-#include <svl/urihelper.hxx>
-#include <svtools/rtftoken.h>
-#include <svl/zforlist.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/brkitem.hxx>
-#include <fmtfld.hxx>
-#include <fmtinfmt.hxx>
-#include <swtypes.hxx>
-#include <doc.hxx>
-#include <pam.hxx>
-#include <ndtxt.hxx>
-#include <shellio.hxx>
-#include <fldbas.hxx>
-#include <swparrtf.hxx>
-#include <txatbase.hxx>
-#include <dbfld.hxx>
-#include <usrfld.hxx>
-#include <docufld.hxx>
-#include <flddat.hxx>
-#include <charfmt.hxx>
-#include <fmtruby.hxx>
-#include <breakit.hxx>
-#include <reffld.hxx>
-#include <SwStyleNameMapper.hxx>
-#include <editeng/charhiddenitem.hxx>
-
-
-// bestimme, ob es sich um ein IMPORT/TOC - Feld handelt.
-// return: 0 - weder noch,
-// 1 - TOC
-// 2 - IMPORT
-// 3 - INDEX
-enum RTF_FLD_TYPES {
- RTFFLD_UNKNOWN = 0,
- RTFFLD_TOC,
- RTFFLD_IMPORT,
- RTFFLD_INDEX,
- RTFFLD_SYMBOL,
- RTFFLD_PAGE,
- RTFFLD_NUMPAGES,
- RTFFLD_DATE,
- RTFFLD_TIME,
- RTFFLD_DATA,
- RTFFLD_MERGEFLD,
- RTFFLD_HYPERLINK,
- RTFFLD_REF,
- RTFFLD_PAGEREF,
- RTFFLD_EQ,
- RTFFLD_INCLUDETEXT
-};
-
-class RtfFieldSwitch
-{
- String sParam;
- xub_StrLen nCurPos;
-public:
- RtfFieldSwitch( const String& rParam );
- sal_Unicode GetSwitch( String& rParam );
-
- sal_Bool IsAtEnd() const { return nCurPos >= sParam.Len(); }
- xub_StrLen GetCurPos() const { return nCurPos; }
- void Erase( xub_StrLen nEndPos ) { sParam.Erase( 0, nEndPos ); }
- void Insert( const String& rIns ) { sParam.Insert( rIns, 0 ); }
- const String& GetStr() const { return sParam; }
-};
-
-RtfFieldSwitch::RtfFieldSwitch( const String& rParam )
- : nCurPos( 0 )
-{
- sParam = comphelper::string::strip(rParam, ' ');
-}
-
-sal_Unicode RtfFieldSwitch::GetSwitch( String& rParam )
-{
- // beginnt ein Schalter?
- sal_Unicode c, cKey = 0;
- if( '\\' == (c = sParam.GetChar( nCurPos )) )
- {
- if( '\\' == ( c = sParam.GetChar( ++nCurPos )) )
- c = sParam.GetChar( ++nCurPos );
-
- cKey = c;
-
- while( ++nCurPos < sParam.Len() &&
- ' ' == ( c = sParam.GetChar( nCurPos )) )
- ;
- }
-
- // dann alles in Hochkommatas oder bis zum naechsten // als
- // Param returnen
- sal_uInt16 nOffset;
- if( '"' != c && '\'' != c )
- c = '\\', nOffset = 0;
- else
- nOffset = 1;
-
- sParam.Erase( 0, nCurPos + nOffset );
- rParam = sParam.GetToken( 0, c );
- sParam = comphelper::string::stripStart(sParam.Erase(0, rParam.Len() + nOffset), ' ');
- if( '\\' == c )
- rParam = comphelper::string::stripEnd(rParam, ' ');
- nCurPos = 0;
-
- return cKey;
-}
-
-struct RTF_EquationData
-{
- String sFontName, sUp, sDown, sText;
- sal_Int32 nJustificationCode, nFontSize, nUp, nDown, nStyleNo;
-
- inline RTF_EquationData()
- : nJustificationCode(0), nFontSize(0), nUp(0), nDown(0),
- nStyleNo( -1 )
- {}
-};
-
-xub_StrLen lcl_FindEndBracket( const String& rStr )
-{
- xub_StrLen nEnd = rStr.Len(), nRet = STRING_NOTFOUND, nPos = 0;
- int nOpenCnt = 1;
- sal_Unicode cCh;
- for( ; nPos < nEnd; ++nPos )
- if( ')' == (cCh = rStr.GetChar( nPos )) && !--nOpenCnt )
- {
- nRet = nPos;
- break;
- }
- else if( '(' == cCh )
- ++nOpenCnt;
-
- return nRet;
-}
-
-static void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData,
- sal_Unicode nSttKey )
-{
- int nSubSupFlag(0);
- RtfFieldSwitch aRFS( rStr );
- while( !aRFS.IsAtEnd() )
- {
- String sParam;
- sal_Unicode cKey = aRFS.GetSwitch( sParam );
- if( 1 == nSubSupFlag )
- ++nSubSupFlag;
- else if( 1 < nSubSupFlag )
- nSubSupFlag = 0;
-
- sal_Bool bCheckBracket = sal_False;
- switch( cKey )
- {
- case 0:
- switch( nSttKey )
- {
- case 'u': rData.sUp += sParam; break;
- case 'd': rData.sDown += sParam; break;
- default: rData.sText += sParam; break;
- }
- break;
-
- case '*':
- if( sParam.Len() )
- {
- if( sParam.EqualsIgnoreCaseAscii( "jc", 0, 2 ) )
- rData.nJustificationCode = sParam.Copy( 2 ).ToInt32();
- else if( sParam.EqualsIgnoreCaseAscii( "hps", 0, 3 ) )
- rData.nFontSize= sParam.Copy( 3 ).ToInt32();
- else if( sParam.EqualsIgnoreCaseAscii( "Font:", 0, 5 ) )
- rData.sFontName = sParam.Copy( 5 );
- else if( sParam.EqualsIgnoreCaseAscii( "cs", 0, 2 ) )
- rData.nStyleNo = sParam.Copy( 2 ).ToInt32();
- }
- break;
- case 's' :
- ++nSubSupFlag;
- break;
-
- case 'u':
- if( sParam.Len() && 'p' == sParam.GetChar( 0 ) &&
- 2 == nSubSupFlag )
- {
- rData.nUp = sParam.Copy( 1 ).ToInt32();
- bCheckBracket = sal_True;
- }
- break;
-
- case 'd':
- if( sParam.Len() && 'o' == sParam.GetChar( 0 ) &&
- 2 == nSubSupFlag )
- {
- rData.nDown = sParam.Copy( 1 ).ToInt32();
- bCheckBracket = sal_True;
- }
- break;
-
- default:
- bCheckBracket = sal_True;
- cKey = 0;
- break;
- }
-
- if( bCheckBracket && sParam.Len() )
- {
- xub_StrLen nEnd, nStt = sParam.Search( '(' ),
- nLen = sParam.Len();
- if( STRING_NOTFOUND != nStt )
- {
- sParam.Erase( 0, nStt + 1 ) += aRFS.GetStr();
- if( STRING_NOTFOUND !=
- (nEnd = ::lcl_FindEndBracket( sParam )) )
- {
- // end in the added string?
- if( (nLen - nStt - 1 ) < nEnd )
- aRFS.Erase( nEnd + 1 - (nLen - nStt - 1));
- else
- {
- // not all handled here, so set new into the RFS
- aRFS.Insert( sParam.Copy( nEnd + 1,
- nLen - nStt - nEnd - 2 ));
- sal_Unicode cCh;
- if( aRFS.GetStr().Len() &&
- ( ',' == (cCh = aRFS.GetStr().GetChar(0)) ||
- ';' == cCh ))
- aRFS.Erase( 1 );
- }
-
- ::lcl_ScanEquationField( sParam.Copy( 0, nEnd ),
- rData, cKey );
- }
- }
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
deleted file mode 100644
index 5e19830..0000000
--- a/sw/source/filter/rtf/rtffly.cxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <hintids.hxx>
-#include <tools/cachestr.hxx>
-#include <svtools/rtftoken.h>
-#include <svl/itemiter.hxx>
-#include <editeng/prntitem.hxx>
-#include <editeng/opaqitem.hxx>
-#include <editeng/protitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/frmdiritem.hxx>
-#include <fmtfsize.hxx>
-#include <fmtanchr.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtsrnd.hxx>
-#include <fmtclds.hxx>
-#include <fmtcntnt.hxx>
-#include <frmatr.hxx>
-#include <doc.hxx>
-#include <pam.hxx>
-#include <ndtxt.hxx>
-#include <shellio.hxx>
-#include <swparrtf.hxx>
-#include <grfatr.hxx>
-#include <paratr.hxx>
-#include <rtf.hxx>
-#include <ndgrf.hxx>
-#include <pagedesc.hxx>
-#include <swtable.hxx>
-#include <txtflcnt.hxx>
-#include <fmtflcnt.hxx>
-#include <fltini.hxx>
-#include <unoframe.hxx>
-#include <deque>
-#include <map>
-#include <utility>
-// #i27767#
-#include <fmtwrapinfluenceonobjpos.hxx>
-#include <editeng/brshitem.hxx>
-#include <fmtfollowtextflow.hxx>
-#include "dcontact.hxx"
-
-using namespace ::com::sun::star;
-
-#define ANCHOR(p) ((SwFmtAnchor*)p)
-
-// steht in shellio.hxx
-extern SwCntntNode* GoNextNds( SwNodeIndex * pIdx, sal_Bool bChk );
-
-inline const SwFmtFrmSize GetFrmSize(const SfxItemSet& rSet, sal_Bool bInP=sal_True)
-{
- return (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE,bInP);
-}
-
-SwFlySave::SwFlySave(const SwPaM& rPam, SfxItemSet& rSet)
- : aFlySet(rSet), nSttNd(rPam.GetPoint()->nNode), nEndNd(nSttNd), nEndCnt(0),
- nPageWidth(ATT_MIN_SIZE), nDropLines(0), nDropAnchor(0)
-{
-}
-
-int SwFlySave::IsEqualFly( const SwPaM& rPos, SfxItemSet& rSet )
-{
- if( rSet.Count() != aFlySet.Count() || nDropAnchor )
- return sal_False;
-
- // nur TextNodes zusammenfassen
- if( nSttNd == nEndNd && nEndNd.GetNode().IsNoTxtNode() )
- return sal_False;
-
- // teste auf gleiche / naechste Position
- if( rPos.GetPoint()->nNode.GetIndex() == nEndNd.GetIndex() )
- {
- if( 1 < (rPos.GetPoint()->nContent.GetIndex() - nEndCnt) )
- return sal_False;
- }
- else if( rPos.GetPoint()->nContent.GetIndex() )
- return sal_False;
- else
- {
- SwNodeIndex aIdx( nEndNd );
- SwCntntNode *const pCNd = aIdx.GetNode().GetCntntNode();
- if( !GoNextNds( &aIdx, sal_True ) ||
- aIdx.GetIndex() != rPos.GetPoint()->nNode.GetIndex() ||
- ( pCNd && pCNd->Len() != nEndCnt ))
- {
- return sal_False;
- }
- }
-
- if( rSet.Count() )
- {
- SfxItemIter aIter( rSet );
- const SfxPoolItem *pItem, *pCurr = aIter.GetCurItem();
- while( sal_True )
- {
- if( SFX_ITEM_SET != aFlySet.GetItemState( pCurr->Which(),
- sal_False, &pItem ) ||
- // Ankerattribute gesondert behandeln
- ( RES_ANCHOR == pCurr->Which()
- ? (ANCHOR(pCurr)->GetAnchorId() != ANCHOR(pItem)->GetAnchorId() ||
- ANCHOR(pCurr)->GetPageNum() != ANCHOR(pItem)->GetPageNum())
- : *pItem != *pCurr ))
- return sal_False;
-
- if( aIter.IsAtEnd() )
- break;
- pCurr = aIter.NextItem();
- }
- }
- return sal_True;
-}
-
-void SwFlySave::SetFlySize( const SwTableNode& rTblNd )
-{
- // sollte der Fly kleiner als diese Tabelle sein, dann
- // korrigiere diesen (nur bei abs. Angaben!)
- SwTwips nWidth = rTblNd.GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
- const SwFmtFrmSize& rSz = GetFrmSize( aFlySet );
- if( nWidth > rSz.GetWidth() )
- aFlySet.Put( SwFmtFrmSize( rSz.GetHeightSizeType(), nWidth, rSz.GetHeight() ));
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
deleted file mode 100644
index 54f47b9..0000000
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <hintids.hxx>
-#include <tools/stream.hxx>
-#include <svtools/rtftoken.h>
-#include <svtools/rtfkeywd.hxx>
-#include <svl/intitem.hxx>
-#include <svtools/rtfout.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/cmapitem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wrlmitem.hxx>
-#include <editeng/numitem.hxx>
-#include <shellio.hxx>
-#include <fltini.hxx>
-#include <swtypes.hxx>
-#include <swparrtf.hxx>
-#include <ndtxt.hxx>
-#include <doc.hxx>
-#include <docary.hxx>
-#include <pam.hxx>
-#include <charfmt.hxx>
-#include <charatr.hxx>
-#include <paratr.hxx>
-#include <cmdid.h>
-#include <numrule.hxx>
-
-#define RTF_NUMRULE_NAME "RTF_Num"
-
-SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, sal_uInt8 nNumLvl )
-{
- SwCharFmt* pChrFmt = rRule.Get( nNumLvl ).GetCharFmt();
- if( !pChrFmt )
- {
- String sNm( rRule.GetName() );
- ( sNm += ' ' ) += String::CreateFromInt32( nNumLvl + 1 );
- pChrFmt = rDoc.MakeCharFmt( sNm, rDoc.GetDfltCharFmt() );
- if( !rRule.GetNumFmt( nNumLvl ))
- rRule.Set( nNumLvl, rRule.Get( nNumLvl ) );
- ((SwNumFmt*)rRule.GetNumFmt( nNumLvl ))->SetCharFmt( pChrFmt );
- }
- return (SfxItemSet&)pChrFmt->GetAttrSet();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 02c7bdf..b64fba0 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -17,92 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <hintids.hxx>
-
-#include <stack>
-
-#include <tools/errinf.hxx>
#include <tools/stream.hxx>
-#include <tools/helpers.hxx>
-#include <svl/itemiter.hxx>
-#include <svtools/rtftoken.h>
-#include <svl/intitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/lspcitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/escpitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/frmdiritem.hxx>
-#include <editeng/hyznitem.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtfld.hxx>
-#include <fmthdft.hxx>
-#include <fmtcntnt.hxx>
-#include <txtftn.hxx>
-#include <fmtclds.hxx>
-#include <fmtftn.hxx>
-#include <fmtfsize.hxx>
-#include <fmtflcnt.hxx>
-#include <fmtanchr.hxx>
-#include <frmatr.hxx>
-#include <docstat.hxx>
-#include <swtable.hxx>
+#include <poolfmt.hxx>
#include <shellio.hxx>
-#include <swtypes.hxx>
#include <ndtxt.hxx>
#include <doc.hxx>
-#include <docary.hxx>
+#include <docsh.hxx>
#include <pam.hxx>
-#include <mdiexp.hxx> // ...Percent()
-#include <swparrtf.hxx>
-#include <charfmt.hxx>
-#include <pagedesc.hxx>
-#include <ftninfo.hxx>
-#include <docufld.hxx>
-#include <flddat.hxx>
-#include <fltini.hxx>
-#include <fchrfmt.hxx>
-#include <paratr.hxx>
-#include <section.hxx>
-#include <fmtclbl.hxx>
-#include <viewsh.hxx>
-#include <shellres.hxx>
-#include <hfspacingitem.hxx>
-#include <tox.hxx>
#include <swerror.h>
-#include <cmdid.h>
-#include <statstr.hrc> // ResId fuer Statusleiste
-#include <SwStyleNameMapper.hxx>
-#include <tblsel.hxx> // SwSelBoxes
-#include <docsh.hxx>
-#include <fmtlsplt.hxx> // SwLayoutSplit
#include <unotextrange.hxx>
-#include <editeng/keepitem.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/svdorect.hxx>
-
-#include <fmtsrnd.hxx>
-#include <fmtfollowtextflow.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
-#include <editeng/opaqitem.hxx>
-#include "svx/svdograf.hxx"
-#include <svx/xflclit.hxx>
-#include <svx/xlnwtit.hxx>
-#include <svx/svdoutl.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/paperinf.hxx>
-
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/range/b2drange.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XFilter.hpp>
@@ -110,18 +37,8 @@
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/text/XTextRange.hpp>
-
using namespace ::com::sun::star;
-
-// einige Hilfs-Funktionen
-// char
-inline const SvxFontHeightItem& GetSize(const SfxItemSet& rSet,sal_Bool bInP=sal_True)
- { return (const SvxFontHeightItem&)rSet.Get( RES_CHRATR_FONTSIZE,bInP); }
-inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_Bool bInP=sal_True)
- { return (const SvxLRSpaceItem&)rSet.Get( RES_LR_SPACE,bInP); }
-
-
/// Glue class to call RtfImport as an internal filter, needed by copy&paste support.
class SwRTFReader : public Reader
{
@@ -156,7 +73,7 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& rPa
SwDocShell *pDocShell(rDoc.GetDocShell());
uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory(comphelper::getProcessServiceFactory());
uno::Reference<uno::XInterface> xInterface(xMultiServiceFactory->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.RtfFilter"))), uno::UNO_QUERY_THROW);
+ "com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW);
uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY_THROW);
uno::Reference<lang::XComponent> xDstDoc(pDocShell->GetModel(), uno::UNO_QUERY_THROW);
@@ -167,7 +84,7 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& rPa
uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY_THROW);
uno::Sequence<beans::PropertyValue> aDescriptor(3);
- aDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
+ aDescriptor[0].Name = "InputStream";
uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStrm));
aDescriptor[0].Value <<= xStream;
aDescriptor[1].Name = "IsNewDoc";
@@ -225,175 +142,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
return new SwRTFReader();
}
-bool HasHeader(const SwFrmFmt &rFmt)
-{
- const SfxPoolItem *pHd;
- if (SFX_ITEM_SET == rFmt.GetItemState(RES_HEADER, false, &pHd))
- return ((const SwFmtHeader *)(pHd))->IsActive();
- return false;
-}
-
-bool HasFooter(const SwFrmFmt &rFmt)
-{
- const SfxPoolItem *pFt;
- if (SFX_ITEM_SET == rFmt.GetItemState(RES_FOOTER, false, &pFt))
- return ((const SwFmtFooter *)(pFt))->IsActive();
- return false;
-}
-
-namespace sw{
- namespace util{
-
-InsertedTableClient::InsertedTableClient(SwTableNode & rNode)
-{
- rNode.Add(this);
-}
-
-SwTableNode * InsertedTableClient::GetTableNode()
-{
- return dynamic_cast<SwTableNode *> (GetRegisteredInNonConst());
-}
-
-InsertedTablesManager::InsertedTablesManager(const SwDoc &rDoc)
- : mbHasRoot(rDoc.GetCurrentLayout()) //swmod 080218
-{
-}
-
-void InsertedTablesManager::DelAndMakeTblFrms()
-{
- if (!mbHasRoot)
- return;
- TblMapIter aEnd = maTables.end();
- for (TblMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
- {
- // exitiert schon ein Layout, dann muss an dieser Tabelle die BoxFrames
- // neu erzeugt
- SwTableNode *pTable = aIter->first->GetTableNode();
- OSL_ENSURE(pTable, "Why no expected table");
- if (pTable)
- {
- SwFrmFmt * pFrmFmt = pTable->GetTable().GetFrmFmt();
-
- if (pFrmFmt != NULL)
- {
- SwNodeIndex *pIndex = aIter->second;
- pTable->DelFrms();
- pTable->MakeFrms(pIndex);
- }
- }
- }
-}
-
-void InsertedTablesManager::InsertTable(SwTableNode &rTableNode, SwPaM &rPaM)
-{
- if (!mbHasRoot)
- return;
- //Associate this tablenode with this after position, replace an //old
- //node association if necessary
-
- InsertedTableClient * pClient = new InsertedTableClient(rTableNode);
-
- maTables.insert(TblMap::value_type(pClient, &(rPaM.GetPoint()->nNode)));
-}
-}
-}
-
-::basegfx::B2DPoint rotate(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd)
-{
- const ::basegfx::B2DVector aVector(rStart - rEnd);
- return ::basegfx::B2DPoint(aVector.getY() + rEnd.getX(), -aVector.getX() + rEnd.getY());
-}
-
-
-DocPageInformation::DocPageInformation()
- : maBox( RES_BOX ),
- mnPaperw(12240), mnPaperh(15840), mnMargl(1800), mnMargr(1800),
- mnMargt(1440), mnMargb(1440), mnGutter(0), mnPgnStart(1), mbFacingp(false),
- mbLandscape(false), mbRTLdoc(false)
-{
-}
-
-SectPageInformation::SectPageInformation(const DocPageInformation &rDoc)
- : maBox(rDoc.maBox), mpTitlePageHdFt(0), mpPageHdFt(0),
- mnPgwsxn(rDoc.mnPaperw), mnPghsxn(rDoc.mnPaperh), mnMarglsxn(rDoc.mnMargl),
- mnMargrsxn(rDoc.mnMargr), mnMargtsxn(rDoc.mnMargt),
- mnMargbsxn(rDoc.mnMargb), mnGutterxsn(rDoc.mnGutter), mnHeadery(720),
- mnFootery(720), mnPgnStarts(rDoc.mnPgnStart), mnCols(1), mnColsx(720),
- mnStextflow(rDoc.mbRTLdoc ? 3 : 0), mnBkc(2), mbLndscpsxn(rDoc.mbLandscape),
- mbTitlepg(false), mbFacpgsxn(rDoc.mbFacingp), mbRTLsection(rDoc.mbRTLdoc),
- mbPgnrestart(false), mbTitlePageHdFtUsed(false), mbPageHdFtUsed(false)
-{
-};
-
-SectPageInformation::SectPageInformation(const SectPageInformation &rSect)
- : maColumns(rSect.maColumns), maBox(rSect.maBox),
- maNumType(rSect.maNumType), mpTitlePageHdFt(rSect.mpTitlePageHdFt),
- mpPageHdFt(rSect.mpPageHdFt), mnPgwsxn(rSect.mnPgwsxn),
- mnPghsxn(rSect.mnPghsxn), mnMarglsxn(rSect.mnMarglsxn),
- mnMargrsxn(rSect.mnMargrsxn), mnMargtsxn(rSect.mnMargtsxn),
- mnMargbsxn(rSect.mnMargbsxn), mnGutterxsn(rSect.mnGutterxsn),
- mnHeadery(rSect.mnHeadery), mnFootery(rSect.mnFootery),
- mnPgnStarts(rSect.mnPgnStarts), mnCols(rSect.mnCols),
- mnColsx(rSect.mnColsx), mnStextflow(rSect.mnStextflow), mnBkc(rSect.mnBkc),
- mbLndscpsxn(rSect.mbLndscpsxn), mbTitlepg(rSect.mbTitlepg),
- mbFacpgsxn(rSect.mbFacpgsxn), mbRTLsection(rSect.mbRTLsection),
- mbPgnrestart(rSect.mbPgnrestart),
- mbTitlePageHdFtUsed(rSect.mbTitlePageHdFtUsed),
- mbPageHdFtUsed(rSect.mbPageHdFtUsed)
-{
-};
-
-rtfSection::rtfSection(const SwPosition &rPos,
- const SectPageInformation &rPageInfo)
- : maStart(rPos.nNode), maPageInfo(rPageInfo), mpSection(0), mpTitlePage(0),
- mpPage(0)
-{
-}
-
-BookmarkPosition::BookmarkPosition(const SwPaM &rPaM)
- : maMkNode(rPaM.GetMark()->nNode),
- mnMkCntnt(rPaM.GetMark()->nContent.GetIndex())
-{
-}
-
-BookmarkPosition::BookmarkPosition(const BookmarkPosition &rEntry)
- : maMkNode(rEntry.maMkNode), mnMkCntnt(rEntry.mnMkCntnt)
-{
-}
-
-bool BookmarkPosition::operator==(const BookmarkPosition rhs)
-{
- return(maMkNode.GetIndex() == rhs.maMkNode.GetIndex() && mnMkCntnt == rhs.mnMkCntnt);
-}
-
-sal_uLong SwNodeIdx::GetIdx() const
-{
- return aIdx.GetIndex();
-}
-
-SvxNodeIdx* SwNodeIdx::Clone() const
-{
- return new SwNodeIdx( aIdx );
-}
-
-SvxPosition* SwxPosition::Clone() const
-{
- return new SwxPosition( pPam );
-}
-
-SvxNodeIdx* SwxPosition::MakeNodeIdx() const
-{
- return new SwNodeIdx( pPam->GetPoint()->nNode );
-}
-
-sal_uLong SwxPosition::GetNodeIdx() const
-{
- return pPam->GetPoint()->nNode.GetIndex();
-}
-
-xub_StrLen SwxPosition::GetCntIdx() const
-{
- return pPam->GetPoint()->nContent.GetIndex();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
deleted file mode 100644
index 86a0815..0000000
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- 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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SWPARRTF_HXX
-#define _SWPARRTF_HXX
-
-#include <deque>
-#include <vector>
-#include <map>
-
-#include <editeng/svxrtf.hxx>
-#include <editeng/numitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <redline.hxx>
-
-#include <fltshell.hxx> // fuer den Attribut Stack
-#include <ndindex.hxx>
-#include "../inc/msfilter.hxx"
-#include <svx/svdobj.hxx>
-
-
-extern void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt8 nCol, short nIdx,
- sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize);
-
-class Font;
-class Graphic;
-
-class SwNoTxtNode;
-class Size;
-class SwPaM;
-class SwDoc;
-class SwPageDesc;
-class SwTxtFmtColl;
-class SwTableNode;
-class SwCharFmt;
-class SwNumRule;
-class SvxFontItem;
-class SwRelNumRuleSpaces;
-class SwNodeNum;
-class SwTxtNode;
-struct SvxRTFPictureType;
-
-class SwNodeIdx : public SvxNodeIdx
-{
- SwNodeIndex aIdx;
-public:
- SwNodeIdx( const SwNodeIndex& rIdx ) : aIdx( rIdx ) {}
- virtual sal_uLong GetIdx() const;
- virtual SvxNodeIdx* Clone() const;
-};
-
-class BookmarkPosition
-{
-public:
- SwNodeIndex maMkNode;
- xub_StrLen mnMkCntnt;
- BookmarkPosition(const SwPaM &rPaM);
- BookmarkPosition(const BookmarkPosition &rEntry);
-
- bool operator==(const BookmarkPosition);
-private:
- //No assignment
- BookmarkPosition& operator=(const BookmarkPosition&);
-
-};
-
-class SwxPosition : public SvxPosition
-{
- SwPaM* pPam;
-public:
- SwxPosition( SwPaM* pCrsr ) : pPam( pCrsr ) {}
-
- virtual sal_uLong GetNodeIdx() const;
- virtual xub_StrLen GetCntIdx() const;
-
- // erzeuge von sich selbst eine Kopie
- virtual SvxPosition* Clone() const;
- // erzeuge vom NodeIndex eine Kopie
- virtual SvxNodeIdx* MakeNodeIdx() const;
-};
-
-
-// zum zwischenspeichern der Flys:
-struct SwFlySave
-{
- SfxItemSet aFlySet;
- SwNodeIndex nSttNd, nEndNd;
- xub_StrLen nEndCnt;
- SwTwips nPageWidth;
- sal_uInt16 nDropLines, nDropAnchor;
-
- SwFlySave( const SwPaM& rPam, SfxItemSet& rSet );
- int IsEqualFly( const SwPaM& rPos, SfxItemSet& rSet );
- void SetFlySize( const SwTableNode& rTblNd );
-};
-
-struct SwListEntry
-{
- long nListId, nListTemplateId, nListNo;
- sal_uInt16 nListDocPos;
- sal_Bool bRuleUsed;
-
- SwListEntry()
- : nListId( 0 ), nListTemplateId( 0 ), nListNo( 0 ), nListDocPos( 0 ),
- bRuleUsed( sal_False )
- {}
- SwListEntry( long nLstId, long nLstTmplId, sal_uInt16 nLstDocPos )
- : nListId( nLstId ), nListTemplateId( nLstTmplId ), nListNo( 0 ),
- nListDocPos( nLstDocPos ), bRuleUsed( sal_False )
- {}
-
- void Clear() { nListId = nListTemplateId = nListNo = 0, nListDocPos = 0;
- bRuleUsed = sal_False; }
-};
-
-class SwFlySaveArr : public std::vector<SwFlySave*>
-{
-public:
- SwFlySaveArr() : ::std::vector<SwFlySave*>() {}
- SwFlySaveArr(const SwFlySaveArr& rOther)
- : ::std::vector<SwFlySave*>(rOther)
- {}
-
- ~SwFlySaveArr()
- {
- for(const_iterator it = begin(); it != end(); ++it)
- delete *it;
- }
-};
-
-typedef std::deque< SwListEntry > SwListArr;
-
-struct DocPageInformation
-{
- SvxBoxItem maBox;
- long mnPaperw;
- long mnPaperh;
- long mnMargl;
- long mnMargr;
- long mnMargt;
- long mnMargb;
- long mnGutter;
- long mnPgnStart;
- bool mbFacingp;
- bool mbLandscape;
- bool mbRTLdoc;
- DocPageInformation();
-};
-
-struct SectPageInformation
-{
- std::vector<long> maColumns;
- SvxBoxItem maBox;
- SvxNumberType maNumType;
- SwPageDesc *mpTitlePageHdFt;
- SwPageDesc *mpPageHdFt;
- long mnPgwsxn;
- long mnPghsxn;
- long mnMarglsxn;
- long mnMargrsxn;
- long mnMargtsxn;
- long mnMargbsxn;
- long mnGutterxsn;
- long mnHeadery;
- long mnFootery;
- long mnPgnStarts;
- long mnCols;
- long mnColsx;
- long mnStextflow;
- int mnBkc;
- bool mbLndscpsxn;
- bool mbTitlepg;
- bool mbFacpgsxn;
- bool mbRTLsection;
- bool mbPgnrestart;
- bool mbTitlePageHdFtUsed;
- bool mbPageHdFtUsed;
- SectPageInformation(const DocPageInformation &rDoc);
- SectPageInformation(const SectPageInformation &rSect);
-};
-
-class rtfSection
-{
-public:
- rtfSection(const SwPosition &rPos,
- const SectPageInformation &rPageInfo);
- SwNodeIndex maStart;
- SectPageInformation maPageInfo;
- SwSection *mpSection;
- SwPageDesc *mpTitlePage;
- SwPageDesc *mpPage;
-
- bool IsContinous() const { return maPageInfo.mnBkc == 0; }
- long NoCols() const { return maPageInfo.mnCols; }
- long StandardColSeperation() const { return maPageInfo.mnColsx; }
- bool HasTitlePage() const { return maPageInfo.mbTitlepg; }
- long PageStartAt() const { return maPageInfo.mnPgnStarts; }
- bool PageRestartNo() const { return maPageInfo.mbPgnrestart; }
- bool IsBiDi() const { return maPageInfo.mbRTLsection; }
- long GetPageWidth() const { return maPageInfo.mnPgwsxn; }
- long GetPageHeight() const { return maPageInfo.mnPghsxn; }
- long GetPageLeft() const { return maPageInfo.mnMarglsxn; }
- long GetPageRight() const { return maPageInfo.mnMargrsxn; }
- bool IsLandScape() const { return maPageInfo.mbLndscpsxn; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index e191a32..5d1f1b1 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -143,20 +143,6 @@ namespace
namespace ww
{
- //Original code/idea by Takashi Ono for CJK
- sti GetCanonicalStiFromEnglishName(const String &rName) throw()
- {
- typedef const sal_Char** myIter;
- sti eRet = stiUser;
- myIter aBegin = GetStiNames();
- myIter aEnd(aBegin);
- std::advance(aEnd, stiMax);
- myIter aIter = std::find_if(aBegin, aEnd, SameName(rName));
- if (aIter != aEnd)
- eRet = static_cast<sti>(std::distance(aBegin, aIter));
- return eRet;
- }
-
const sal_Char* GetEnglishNameFromSti(sti eSti) throw()
{
if (eSti >= stiMax)
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 481b9a8..2d4ab8d 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -757,6 +757,62 @@ namespace sw
return nRet;
}
}
+
+ namespace util
+ {
+ InsertedTableClient::InsertedTableClient(SwTableNode & rNode)
+ {
+ rNode.Add(this);
+ }
+
+ SwTableNode * InsertedTableClient::GetTableNode()
+ {
+ return dynamic_cast<SwTableNode *> (GetRegisteredInNonConst());
+ }
+
+ InsertedTablesManager::InsertedTablesManager(const SwDoc &rDoc)
+ : mbHasRoot(rDoc.GetCurrentLayout()) //swmod 080218
+ {
+ }
+
+ void InsertedTablesManager::DelAndMakeTblFrms()
+ {
+ if (!mbHasRoot)
+ return;
+ TblMapIter aEnd = maTables.end();
+ for (TblMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
+ {
+ // exitiert schon ein Layout, dann muss an dieser Tabelle die BoxFrames
+ // neu erzeugt
+ SwTableNode *pTable = aIter->first->GetTableNode();
+ OSL_ENSURE(pTable, "Why no expected table");
+ if (pTable)
+ {
+ SwFrmFmt * pFrmFmt = pTable->GetTable().GetFrmFmt();
+
+ if (pFrmFmt != NULL)
+ {
+ SwNodeIndex *pIndex = aIter->second;
+ pTable->DelFrms();
+ pTable->MakeFrms(pIndex);
+ }
+ }
+ }
+ }
+
+ void InsertedTablesManager::InsertTable(SwTableNode &rTableNode, SwPaM &rPaM)
+ {
+ if (!mbHasRoot)
+ return;
+ //Associate this tablenode with this after position, replace an //old
+ //node association if necessary
+
+ InsertedTableClient * pClient = new InsertedTableClient(rTableNode);
+
+ maTables.insert(TblMap::value_type(pClient, &(rPaM.GetPoint()->nNode)));
+ }
+ }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 80cf41b..c90bc1c 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -38,7 +38,6 @@ class BookmarkCombo : public SwComboBox
virtual long PreNotify(NotifyEvent& rNEvt);
public:
BookmarkCombo( Window* pWin );
- BookmarkCombo( Window* pWin, const ResId& rResId );
sal_uInt16 GetSelectEntryCount() const;
sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 06411f9..8ab55b4 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -154,13 +154,8 @@ SwInsertBookmarkDlg::~SwInsertBookmarkDlg()
{
}
-BookmarkCombo::BookmarkCombo(Window* pWin) :
- SwComboBox(pWin)
-{
-}
-
-BookmarkCombo::BookmarkCombo( Window* pWin, const ResId& rResId ) :
- SwComboBox(pWin, rResId)
+BookmarkCombo::BookmarkCombo(Window* pWin)
+ : SwComboBox(pWin)
{
}
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 63fa5d4..7173fc8 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -81,13 +81,10 @@ public:
SwVbaReadFieldParams( const String& rData );
~SwVbaReadFieldParams();
- xub_StrLen GoToTokenParam();
long SkipToNextToken();
xub_StrLen GetTokenSttPtr() const { return nFnd; }
xub_StrLen FindNextStringPiece( xub_StrLen _nStart = STRING_NOTFOUND );
- bool GetTokenSttFromTo(xub_StrLen* _pFrom, xub_StrLen* _pTo,
- xub_StrLen _nMax);
String GetResult() const;
String GetFieldName()const { return aFieldName; }
@@ -133,15 +130,6 @@ String SwVbaReadFieldParams::GetResult() const
}
-xub_StrLen SwVbaReadFieldParams::GoToTokenParam()
-{
- xub_StrLen nOld = nNext;
- if( -2 == SkipToNextToken() )
- return GetTokenSttPtr();
- nNext = nOld;
- return STRING_NOTFOUND;
-}
-
// ret: -2: NOT a '\' parameter but normal Text
long SwVbaReadFieldParams::SkipToNextToken()
{
@@ -238,33 +226,6 @@ xub_StrLen SwVbaReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
return n;
}
-
-
-// read parameters "1-3" or 1-3 with both values between 1 and nMax
-bool SwVbaReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax)
-{
- sal_uInt16 nStart = 0;
- sal_uInt16 nEnd = 0;
- xub_StrLen n = GoToTokenParam();
- if( STRING_NOTFOUND != n )
- {
-
- String sParams( GetResult() );
-
- xub_StrLen nIndex = 0;
- String sStart( sParams.GetToken(0, '-', nIndex) );
- if( STRING_NOTFOUND != nIndex )
- {
- nStart = static_cast<sal_uInt16>(sStart.ToInt32());
- nEnd = static_cast<sal_uInt16>(sParams.Copy(nIndex).ToInt32());
- }
- }
- if( pFrom ) *pFrom = nStart;
- if( pTo ) *pTo = nEnd;
-
- return nStart && nEnd && (nMax >= nStart) && (nMax >= nEnd);
-}
-
// *** SwVbaFields ***********************************************
static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Any& aSource )
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index 5d46d0f..8a6e44c 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -187,7 +187,6 @@ public:
sal_uInt32 GetRemainSize();
const rtl::OUString& GetFileName() const;
- rtl::OUString getPrefixName() const;
sal_Int16 ReadShort();
sal_Int32 ReadLong();
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8ddef9c..0f3d43c 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1606,11 +1606,6 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName,
return pImp ? new ResMgr( pImp ) : NULL;
}
-rtl::OUString ResMgr::getPrefixName() const
-{
- return pImpRes->aPrefix;
-}
-
ResMgr* ResMgr::SearchCreateResMgr(
const sal_Char* pPrefixName,
com::sun::star::lang::Locale& rLocale )
diff --git a/unusedcode.easy b/unusedcode.easy
index 75f6d12..43b8a20 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,21 +1,21 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
-GraphicObject::SwapIn(SvStream*)
-Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
-PoHeader::getLanguage() const
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
ScMenuFloatingWindow::getDoc()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
+SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*)
+String::Assign(unsigned short const*, unsigned short)
String::String(unsigned short)
-SvNumberFormatter::PutandConvertEntrySystem(rtl::OUString&, int&, short&, unsigned int&, unsigned short, unsigned short)
+SvListView::HasEntryFocus(SvTreeListEntry*) const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
-SvTreeListBox::GetParent(SvTreeListEntry const*) const
+SvViewDataEntry::SetCursored(bool)
SvtGraphicStroke::toString() const
TextEngine::GetLeftMargin() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
+TransitionScene::clear()
UnoControl::UnoControl()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
@@ -66,8 +66,9 @@ unicode::isDigit(unsigned short)
unicode::isLower(unsigned short)
unicode::isPrint(unsigned short)
unicode::isUpper(unsigned short)
-writerfilter::createStreamHandler()
writerfilter::doctokidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
+writerfilter::logger(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
writerfilter::ooxmlidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
writerfilter::ooxmlsprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
+writerfilter::rtftok::RTFSprms::swap(writerfilter::rtftok::RTFSprms&)
writerfilter::sprmidsToXML(std::basic_ostream<char, std::char_traits<char> >&)
diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
index 999cf55..642c08c 100644
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
@@ -32,7 +32,6 @@ protected:
css::uno::Reference< css::uno::XInterface > mxVBProject;
protected:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list