summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-21 11:42:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-21 11:55:59 +0100
commit838e221ea06b1861423a76ab379e02be0e4bff84 (patch)
treec156a37c134388a3a9d7fe92e057a05830ee8090 /sw
parent8cd2a372e3867f99b397b9ec089d6e1f7efd1088 (diff)
some ww6 left-overs
Change-Id: I523d304cb81e2f8440e1e87e427d336ab120bb6c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx7
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx1
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx18
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx2
4 files changed, 0 insertions, 28 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 512f26590410..a4bf355d83f2 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -874,13 +874,6 @@ void wwFontHelper::InitFontTable(const SwDoc& rDoc)
}
}
-sal_uInt16 wwFontHelper::GetId(const vcl::Font& rFont)
-{
- wwFont aFont(rFont.GetName(), rFont.GetPitch(), rFont.GetFamily(),
- rFont.GetCharSet());
- return GetId(aFont);
-}
-
sal_uInt16 wwFontHelper::GetId(const SvxFontItem& rFont)
{
wwFont aFont(rFont.GetFamilyName(), rFont.GetPitch(), rFont.GetFamily(),
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3c3aa32b2cb2..8691bfa291f0 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -320,7 +320,6 @@ public:
wwFontHelper() : bLoadAllFonts(false) {}
/// rDoc used only to get the initial standard font(s) in use.
void InitFontTable(const SwDoc& rDoc);
- sal_uInt16 GetId(const vcl::Font& rFont);
sal_uInt16 GetId(const SvxFontItem& rFont);
sal_uInt16 GetId(const wwFont& rFont);
void WriteFontTable( SvStream *pTableStream, WW8Fib& pFib );
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 08d1009a27ff..69bbbd57bede 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1267,24 +1267,6 @@ WW8_BRC::WW8_BRC(const WW8_BRCVer6& brcVer6)
brcVer6.fShadow(), false);
}
-// Convert BRC from WW8 to WW6 format
-WW8_BRCVer6::WW8_BRCVer6(const WW8_BRC& brcVer8)
-{
- sal_uInt8 _brcType = brcVer8.brcType();
- sal_uInt8 _dxpLineWidth = std::max(brcVer8.dptLineWidth() / 6, 7);
- if (_brcType == 5 || _brcType == 6 )
- {
- _dxpLineWidth = _brcType;
- _brcType = 1;
- }
- else if (_brcType > 3)
- {
- _brcType = 1;
- }
- *this = WW8_BRCVer6(_dxpLineWidth, _brcType, brcVer8.ico(),
- brcVer8.dptSpace(), brcVer8.fShadow());
-}
-
// Convert BRC from WW8 to WW9 format
WW8_BRCVer9::WW8_BRCVer9(const WW8_BRC& brcVer8)
{
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 08d80c77558b..823c65a6da05 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -263,8 +263,6 @@ struct WW8_BRCVer6 // BoRder Code (WW6 version)
| ((_ico << 6) & 0xc0);
aBits1[1] = (_ico >> 2) | (_dxpSpace << 3);
}
- // Convert BRC from WW8 to WW6 format
- WW8_BRCVer6(const struct WW8_BRC& brcVer8);
};
struct WW8_BRC // BoRder Code (WW8 version)