summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/swbaslnk.hxx9
-rw-r--r--sw/inc/swtypes.hxx3
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx4
-rw-r--r--sw/source/core/unocore/unotbl.cxx1
-rw-r--r--sw/source/filter/html/svxcss1.hxx16
-rw-r--r--sw/source/filter/html/wrthtml.hxx6
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx20
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx17
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx1
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx11
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx4
11 files changed, 11 insertions, 81 deletions
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 1df801feb674..5dcf33a5d9a7 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -23,28 +23,23 @@
class SwNode;
class SwContentNode;
-class ReReadThread;
class SwBaseLink : public ::sfx2::SvBaseLink
{
- friend long GrfNodeChanged( void* pLink, void* pCaller );
-
SwContentNode* pContentNode;
bool bSwapIn : 1;
bool bNoDataFlag : 1;
bool bIgnoreDataChanged : 1;
- ReReadThread* m_pReReadThread;
protected:
- SwBaseLink(): m_pReReadThread(0) {}
+ SwBaseLink() {}
public:
TYPEINFO_OVERRIDE();
SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
: ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
- bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
- m_pReReadThread(0)
+ bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false )
{}
virtual ~SwBaseLink();
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 56d4ac15163f..14d285945d06 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -58,9 +58,6 @@ typedef long SwTwips;
#define INVALID_TWIPS LONG_MAX
#define TWIPS_MAX (LONG_MAX - 1)
-// Converts Twips to Millimeters (1 twip == 17.573 um).
-template <typename T = SwTwips>
-static SAL_CONSTEXPR T TwipsToMm(const double twips) { return static_cast<T>(twips * 0.017573); }
// Converts Millimeters to Twips (1 mm == 56.905479 twips).
template <typename T = SwTwips>
static SAL_CONSTEXPR T MmToTwips(const double mm) { return static_cast<T>(mm / 0.017573); }
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 10d2b632e5b3..ce2caacc445c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -148,10 +148,6 @@ protected:
virtual OUString getTestName() { return OUString(); }
public:
- OUString& getFilterOptions()
- {
- return maFilterOptions;
- }
void setFilterOptions(const OUString &rFilterOptions)
{
maFilterOptions = rFilterOptions;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 457d0d84bff7..12bbf0b72e3a 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -114,7 +114,6 @@ namespace
struct FindUnoInstanceHint SAL_FINAL : SfxHint
{
FindUnoInstanceHint(Tcoretype* pCore) : m_pCore(pCore), m_pResult(nullptr) {};
- void SetResult(Tunotype* pResult) const { m_pResult = pResult; };
const Tcoretype* const m_pCore;
mutable Tunotype* m_pResult;
};
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 697d3c7c22d5..a9dc429ad078 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -159,7 +159,6 @@ class SvxCSS1MapEntry
SvxCSS1PropertyInfo aPropInfo;
public:
-
SvxCSS1MapEntry( SfxItemPool& rPool, const sal_uInt16 *pWhichMap ) :
aItemSet( rPool, pWhichMap )
{}
@@ -172,23 +171,8 @@ public:
const SvxCSS1PropertyInfo& GetPropertyInfo() const { return aPropInfo; }
SvxCSS1PropertyInfo& GetPropertyInfo() { return aPropInfo; }
-
- friend bool operator==( const SvxCSS1MapEntry& rE1,
- const SvxCSS1MapEntry& rE2 );
- friend bool operator<( const SvxCSS1MapEntry& rE1,
- const SvxCSS1MapEntry& rE2 );
};
-inline bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
- return rE1.aKey==rE2.aKey;
-}
-
-inline bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
- return rE1.aKey<rE2.aKey;
-}
-
// Diese Klasse bereitet den Output des CSS1-Parsers auf,
// indem die CSS1-Properties in SvxItem(Set)s umgewandelt werden.
// Ausserdem werden die Selektoren samt zugehoeriger Item-Set
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index c6a4f2a83da0..ba29190c4362 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -249,12 +249,6 @@ struct SwHTMLFormatInfo
bool bHardDrop=false );
~SwHTMLFormatInfo();
- friend bool operator==( const SwHTMLFormatInfo& rInfo1,
- const SwHTMLFormatInfo& rInfo2 )
- {
- return reinterpret_cast<sal_IntPtr>(rInfo1.pFormat) == reinterpret_cast<sal_IntPtr>(rInfo2.pFormat);
- }
-
friend bool operator<( const SwHTMLFormatInfo& rInfo1,
const SwHTMLFormatInfo& rInfo2 )
{
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 9e05bae2b61b..8c50744be0fc 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -30,11 +30,10 @@
namespace ww8
{
- typedef boost::shared_array<sal_uInt8> DataArray_t;
-class WW8Struct : public ::sw::ExternalData
+ class WW8Struct : public ::sw::ExternalData
{
- DataArray_t mp_data;
+ boost::shared_array<sal_uInt8> mp_data;
sal_uInt32 mn_offset;
sal_uInt32 mn_size;
@@ -51,29 +50,22 @@ class WW8Struct : public ::sw::ExternalData
OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
};
-typedef ::std::vector<OUString> StringVector_t;
template <class T>
class WW8Sttb : public WW8Struct
{
typedef std::shared_ptr< void > ExtraPointer_t;
- typedef ::std::vector< ExtraPointer_t > ExtrasVector_t;
- bool bDoubleByteCharacters;
- StringVector_t m_Strings;
- ExtrasVector_t m_Extras;
+ bool bDoubleByteCharacters;
+ std::vector<OUString> m_Strings;
+ std::vector< ExtraPointer_t > m_Extras;
public:
WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize);
virtual ~WW8Sttb();
- StringVector_t & getStrings()
+ std::vector<OUString> & getStrings()
{
return m_Strings;
}
-
- const T * getExtra(sal_uInt32 nEntry) const
- {
- return dynamic_cast<const T *> (m_Extras[nEntry].get());
- }
};
template <class T>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a0f8c04cdcaf..8aba8533f343 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8540,23 +8540,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz
m_pSerializer->endElementNS(XML_w, XML_numPicBullet);
}
-void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrs, ... )
-{
- if( !pAttrList )
- pAttrList.reset(FastSerializerHelper::createAttrList());
-
- va_list args;
- va_start( args, nAttrs );
- for( sal_Int32 i = 0; i<nAttrs; i++)
- {
- sal_Int32 nName = va_arg( args, sal_Int32 );
- const char* pValue = va_arg( args, const char* );
- if( pValue )
- pAttrList->add( nName, pValue );
- }
- va_end( args );
-}
-
void DocxAttributeOutput::AddToAttrList( uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue )
{
AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 187856049b8e..6bdf73a3388c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -714,7 +714,6 @@ private:
void CmdField_Impl( FieldInfos& rInfos );
void EndField_Impl( FieldInfos& rInfos );
- static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6aecff939c48..7091d250006a 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2751,16 +2751,7 @@ void WW8Export::WriteFkpPlcUsw()
if ( pSttbfAssoc ) // #i106057#
{
- ::std::vector<OUString> aStrings;
-
- ::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings();
- ::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end();
- for (::ww8::StringVector_t::const_iterator aIt = aSttbStrings.begin();
- aIt != aItEnd; ++aIt)
- {
- aStrings.push_back(aIt->getStr());
- }
-
+ ::std::vector<OUString> aStrings(pSttbfAssoc->getStrings());
WriteAsStringTable(aStrings, pFib->fcSttbfAssoc,
pFib->lcbSttbfAssoc);
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 970f0c5f4661..7684aa3a8f9b 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -293,7 +293,7 @@ class wwFont
//In some future land the stream could be converted to a nice stream interface
//and we could have harmony
private:
- sal_uInt8 maWW8_FFN[6];
+sal_uInt8 maWW8_FFN[6];
OUString msFamilyNm;
OUString msAltNm;
bool mbAlt;
@@ -301,7 +301,7 @@ private:
FontFamily meFamily;
rtl_TextEncoding meChrSet;
public:
- wwFont( const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
+ wwFont( const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
rtl_TextEncoding eChrSet);
bool Write( SvStream *pTableStram ) const;
void WriteDocx( DocxAttributeOutput* rAttrOutput ) const;
generated by cgit (git 2.34.1) at 2024-07-10 12:56:58 +0000