svx/inc/svx/gallery1.hxx | 3 -
svx/source/gallery2/gallery1.cxx | 26 --------------
sw/source/filter/ww8/ww8par.hxx | 16 ++++----
sw/source/filter/ww8/ww8par5.cxx | 26 +++++++-------
unusedcode.easy | 72 ---------------------------------------
5 files changed, 22 insertions(+), 121 deletions(-)
New commits:
commit 84546683fd91ca211063f7ee39df96958ede9041
Author: Kristian Rietveld <k...@lanedo.com>
Date: Sun Jul 22 11:19:28 2012 +0200
Rename FieldEntry to WW8FieldEntry
When compiled with Clang on OS X, the OS X dynamic linker appears to be
confused about which FieldEntry destructor to call at runtime. In some
cases, the FieldEntry destructor in register/source/reflwrit.cxx is
called instead (both destructors have the same symbol name). This patch
avoids this problem.
Change-Id: I7d69894318cb8fda0a7c5a9b1c2ff3ca0d47a37c
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index dde6d15..9215369 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -456,7 +456,7 @@ namespace sw
}
}
-class FieldEntry
+class WW8FieldEntry
{
private:
::rtl::OUString msBookmarkName;
@@ -468,10 +468,10 @@ class FieldEntry
sw::hack::Position maStartPos;
sal_uInt16 mnFieldId;
sal_uLong mnObjLocFc;
- FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
- FieldEntry(const FieldEntry &rOther) throw();
- FieldEntry &operator=(const FieldEntry &rOther) throw();
- void Swap(FieldEntry &rOther) throw();
+ WW8FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
+ WW8FieldEntry(const WW8FieldEntry &rOther) throw();
+ WW8FieldEntry &operator=(const WW8FieldEntry &rOther) throw();
+ void Swap(WW8FieldEntry &rOther) throw();
SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
@@ -494,7 +494,7 @@ private:
WW8PLCFxSaveAll maPLCFxSave;
SwPosition maTmpPos;
std::deque<bool> maOldApos;
- std::deque<FieldEntry> maOldFieldStack;
+ std::deque<WW8FieldEntry> maOldFieldStack;
SwWW8FltControlStack* mpOldStck;
SwWW8FltAnchorStack* mpOldAnchorStck;
sw::util::RedlineStack *mpOldRedlines;
@@ -985,8 +985,8 @@ private:
where the end point will fall, to do so fully correctly duplicates the
main logic of the filter itself.
*/
- std::deque<FieldEntry> maFieldStack;
- typedef std::deque<FieldEntry>::const_iterator mycFieldIter;
+ std::deque<WW8FieldEntry> maFieldStack;
+ typedef std::deque<WW8FieldEntry>::const_iterator mycFieldIter;
/*
A stack of open footnotes. Should only be one in it at any time.
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index bffc240..412fb14 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -413,7 +413,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
SwPosition aStart(*pPaM->GetPoint());
if (!maFieldStack.empty())
{
- const FieldEntry &rTest = maFieldStack.back();
+ const WW8FieldEntry &rTest = maFieldStack.back();
aStart = rTest.maStartPos;
}
@@ -826,56 +826,56 @@ bool AcceptableNestedField(sal_uInt16 nFieldCode)
}
}
-FieldEntry::FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw()
+WW8FieldEntry::WW8FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw()
: maStartPos(rPos), mnFieldId(nFieldId), mnObjLocFc(0)
{
}
-FieldEntry::FieldEntry(const FieldEntry &rOther) throw()
+WW8FieldEntry::WW8FieldEntry(const WW8FieldEntry &rOther) throw()
: maStartPos(rOther.maStartPos), mnFieldId(rOther.mnFieldId),
mnObjLocFc(rOther.mnObjLocFc)
{
}
-void FieldEntry::Swap(FieldEntry &rOther) throw()
+void WW8FieldEntry::Swap(WW8FieldEntry &rOther) throw()
{
std::swap(maStartPos, rOther.maStartPos);
std::swap(mnFieldId, rOther.mnFieldId);
}
-FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw()
+WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw()
{
- FieldEntry aTemp(rOther);
+ WW8FieldEntry aTemp(rOther);
Swap(aTemp);
return *this;
}
-::rtl::OUString FieldEntry::GetBookmarkName()
+::rtl::OUString WW8FieldEntry::GetBookmarkName()
{
return msBookmarkName;
}
-::rtl::OUString FieldEntry::GetBookmarkCode()
+::rtl::OUString WW8FieldEntry::GetBookmarkCode()
{
return msMarkCode;
}
-void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
+void WW8FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
{
msBookmarkName=bookmarkName;
}
-void FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
+void WW8FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
{
msMarkType=bookmarkType;
}
-void FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode)
+void WW8FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode)
{
msMarkCode = bookmarkCode;
}
-::sw::mark::IFieldmark::parameter_map_t& FieldEntry::getParameters() {
+::sw::mark::IFieldmark::parameter_map_t& WW8FieldEntry::getParameters() {
return maParams;
}
@@ -1020,7 +1020,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
bool bCodeNest = aF.bCodeNest;
if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and loose the
inner data
- maFieldStack.push_back(FieldEntry(*pPaM->GetPoint(), aF.nId));
+ maFieldStack.push_back(WW8FieldEntry(*pPaM->GetPoint(), aF.nId));
if (bNested)
return 0;
commit 9763d60d640c7ca0af0951fbe4464aed41e91fe8
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 23 08:27:11 2012 +0100
callcatcher: update code post some stl conversion
some big hunks melting away now
Change-Id: Ic74870cad06a2322e98bf1a66287a9b29a7b003e
diff --git a/unusedcode.easy b/unusedcode.easy
index a56d38b..d3fa93e 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,14 +1,4 @@
-(anonymous namespace)::compareFiles(rtl::OUString const&, rtl::OUString const&)
-(anonymous namespace)::dumpFillBitmapNameAsAttribute(rtl::OUString,
_xmlTextWriter*)
-(anonymous namespace)::dumpFillHatchNameAsAttribute(rtl::OUString,
_xmlTextWriter*)
-(anonymous
namespace)::dumpGeometryAsElement(com::sun::star::drawing::PolyPolygonBezierCoords,
_xmlTextWriter*)
-(anonymous
namespace)::dumpPolyPolygonBezierAsElement(com::sun::star::drawing::PolyPolygonBezierCoords,
_xmlTextWriter*)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&,
float, int, bool)
-HTMLControls::Insert(HTMLControl const*&, unsigned short&)
-HTMLControls::Insert(HTMLControl const**, unsigned short)
-HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
-HTMLControls::Remove(HTMLControl const*&, unsigned short)
-HTMLControls::Remove(unsigned short, unsigned short)
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
@@ -75,54 +65,24 @@ SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&,
unsigned short&)
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned
short)
SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
+SvxPositionSizeTabPage::GetRect()
SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char
(*)(SvxTabStop const&, void*), void*)
-SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
-SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
-SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short)
-SwBlinkList::Remove(SwBlinkPortion* const&, unsigned short)
SwBlockNames::Insert(SwBlockName const*&, unsigned short&)
SwBlockNames::Insert(SwBlockName const**, unsigned short)
SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short)
SwBlockNames::Remove(SwBlockName const*&, unsigned short)
SwBlockNames::Remove(unsigned short, unsigned short)
-SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
-SwCurrShells::Insert(CurrShell* const&, unsigned short&)
-SwCurrShells::Insert(CurrShell* const*, unsigned short)
-SwCurrShells::Insert(SwCurrShells const*, unsigned short, unsigned short)
-SwCurrShells::Remove(unsigned short, unsigned short)
-SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
-SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
-SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
-SwDestroyList::Insert(SwSectionFrm* const*, unsigned short)
-SwDestroyList::Remove(SwSectionFrm* const&, unsigned short)
-SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&)
-SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
-SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned
short)
-SwGlblDocContents::Remove(SwGlblDocContent* const&, unsigned short)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const&, unsigned short&)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const*, unsigned short)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrms const*, unsigned short, unsigned
short)
-SwHTMLPosFlyFrms::Remove(SwHTMLPosFlyFrm* const&, unsigned short)
-SwInsDBColumns::Insert(SwInsDBColumn* const&, unsigned short&)
-SwInsDBColumns::Insert(SwInsDBColumn* const*, unsigned short)
-SwInsDBColumns::Insert(SwInsDBColumns const*, unsigned short, unsigned short)
-SwInsDBColumns::Remove(SwInsDBColumn* const&, unsigned short)
-SwInsDBColumns::Remove(unsigned short, unsigned short)
SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
SwOutlineNodes::Insert(SwNode* const*, unsigned short)
SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
SwRects::Replace(SwRect const&, unsigned short)
SwRects::Replace(SwRect const*, unsigned short, unsigned short)
SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect
const&, void*), void*)
-SwRedlineDataParentSortArr::DeleteAndDestroy(unsigned short, unsigned short)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned
short, unsigned short)
SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
@@ -139,29 +99,8 @@ SwSortTableLines::Remove(unsigned short, unsigned short)
SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
-SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
-SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
-SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned
short)
-SwWriteTableCols::Remove(SwWriteTableCol* const&, unsigned short)
-SwWriteTableCols::Remove(unsigned short, unsigned short)
-SwWriteTableRows::Insert(SwWriteTableRow* const&, unsigned short&)
-SwWriteTableRows::Insert(SwWriteTableRow* const*, unsigned short)
-SwWriteTableRows::Insert(SwWriteTableRows const*, unsigned short, unsigned
short)
-SwWriteTableRows::Remove(SwWriteTableRow* const&, unsigned short)
-SwWriteTableRows::Remove(unsigned short, unsigned short)
SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const
SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const&, unsigned short&)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const*, unsigned short)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumns_Impl const*, unsigned short,
unsigned short)
-SwXMLTableColumns_Impl::Remove(SwXMLTableColumn_Impl* const&, unsigned short)
-SwXMLTableColumns_Impl::Remove(unsigned short, unsigned short)
-SwpFmts::DeleteAndDestroy(unsigned short, unsigned short)
-SwpFmts::Insert(SwFmt const*&, unsigned short&)
-SwpFmts::Insert(SwFmt const**, unsigned short)
-SwpFmts::Insert(SwpFmts const*, unsigned short, unsigned short)
-SwpFmts::Remove(SwFmt const*&, unsigned short)
-SwpFmts::Remove(unsigned short, unsigned short)
SwpHtEnd::Insert(SwTxtAttr const*&, unsigned short&)
SwpHtEnd::Insert(SwTxtAttr const**, unsigned short)
SwpHtEnd::Insert(SwpHtEnd const*, unsigned short, unsigned short)
@@ -219,15 +158,6 @@ _MergePos::Remove(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const*, unsigned short, unsigned short)
_MergePos_SAR::_ForEach(unsigned short, unsigned short, unsigned char
(*)(_CmpLPt const&, void*), void*)
-_SetGetExpFlds::Insert(_SetGetExpFld* const&, unsigned short&)
-_SetGetExpFlds::Insert(_SetGetExpFld* const*, unsigned short)
-_SetGetExpFlds::Insert(_SetGetExpFlds const*, unsigned short, unsigned short)
-_SetGetExpFlds::Remove(_SetGetExpFld* const&, unsigned short)
-_SfxObjectList::Insert(_FileListEntry const*&, unsigned short&)
-_SfxObjectList::Insert(_FileListEntry const**, unsigned short)
-_SfxObjectList::Insert(_SfxObjectList const*, unsigned short, unsigned short)
-_SfxObjectList::Remove(_FileListEntry const*&, unsigned short)
-_SfxObjectList::Remove(unsigned short, unsigned short)
_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
commit 961305e072417abb47d352e04db12df15499f56a
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 23 08:23:01 2012 +0100
callcatcher: Gallery::GetImportURL freshly unused
since 6d6198393e0677710191248d6f7c9ec15d0f0e0f
Change-Id: I8c08088453027ab7aa0ca964262456475f767a5f
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 081fffd..cdb969a 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -141,7 +141,6 @@ private:
SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const
rtl::OUString& rThemeName );
GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId );
- GalleryImportThemeEntry* ImplGetImportThemeEntry( const rtl::OUString&
rImportName );
GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry*
pThemeEntry );
void ImplDeleteCachedTheme( GalleryTheme* pTheme );
@@ -170,8 +169,6 @@ public:
public:
- INetURLObject GetImportURL( const String& rThemeName );
-
const INetURLObject& GetUserURL() const { return aUserURL; }
const INetURLObject& GetRelativeURL() const { return aRelURL; }
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index f50b3c6..7f43035 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -467,16 +467,6 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const
rtl::OUString& rThemeName )
// ------------------------------------------------------------------------
-GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const
rtl::OUString& rImportName )
-{
- for ( size_t i = 0, n = aImportList.size(); i < n; ++i )
- if ( rImportName == aImportList[ i ]->aUIName )
- return aImportList[ i ];
- return NULL;
-}
-
-// ------------------------------------------------------------------------
-
rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
{
GalleryThemeEntry* pFound = NULL;
@@ -636,22 +626,6 @@ sal_Bool Gallery::RemoveTheme( const String& rThemeName )
// ------------------------------------------------------------------------
-INetURLObject Gallery::GetImportURL( const String& rThemeName )
-{
- INetURLObject aURL;
- GalleryImportThemeEntry* pImportEntry = ImplGetImportThemeEntry(
rThemeName );
-
- if( pImportEntry )
- {
- aURL = pImportEntry->aURL;
- DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
- }
-
- return aURL;
-}
-
-// ------------------------------------------------------------------------
-
GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry*
pThemeEntry )
{
GalleryTheme* pTheme = NULL;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
