[Libreoffice-commits] core.git: include/svl svl/source svtools/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk unusedcode.easy writerfilter/source
Caolán McNamara
caolanm at redhat.com
Wed Sep 17 01:56:15 PDT 2014
include/svl/gridprinter.hxx | 6 -
svl/source/misc/gridprinter.cxx | 10 -
svtools/source/dialogs/roadmapwizard.cxx | 9 -
svtools/source/uno/unocontroltablemodel.cxx | 16 --
svtools/source/uno/unocontroltablemodel.hxx | 4
sw/UIConfig_swriter.mk | 1
sw/inc/editsh.hxx | 4
sw/source/core/edit/editsh.cxx | 8 -
sw/source/filter/ww8/docxsdrexport.cxx | 5
sw/source/filter/ww8/docxsdrexport.hxx | 2
sw/source/uibase/dbui/dbui.cxx | 35 ------
sw/source/uibase/dbui/mmconfigitem.cxx | 18 ---
sw/source/uibase/inc/dbui.hxx | 21 ---
sw/source/uibase/inc/mmconfigitem.hxx | 2
sw/uiconfig/swriter/ui/mmcreatingdialog.ui | 116 ---------------------
unusedcode.easy | 5
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 5
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 2
18 files changed, 269 deletions(-)
New commits:
commit d49d0139a7f4b9835a2179b6dcc6741a41b0197c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 17 09:20:21 2014 +0100
callcatcher: update unused code
Change-Id: I2ddda0600ee876e9886ee3221f0ac5ad515fbd22
diff --git a/include/svl/gridprinter.hxx b/include/svl/gridprinter.hxx
index d63adfc..446072b 100644
--- a/include/svl/gridprinter.hxx
+++ b/include/svl/gridprinter.hxx
@@ -27,14 +27,8 @@ class SVL_DLLPUBLIC GridPrinter
public:
GridPrinter( size_t nRows, size_t nCols, bool bPrint = true );
~GridPrinter();
-
void set( size_t nRow, size_t nCol, const OUString& rStr );
-
void print( const char* pHeader ) const;
-
- void clear();
-
- void resize( size_t nRows, size_t nCols );
};
}
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index a472649..2cbadca 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -126,16 +126,6 @@ void GridPrinter::print( const char* pHeader ) const
}
}
-void GridPrinter::clear()
-{
- mpImpl->maMatrix.clear();
-}
-
-void GridPrinter::resize( size_t nRows, size_t nCols )
-{
- mpImpl->maMatrix.resize(nRows, nCols);
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index a1dc4f9..6e83474 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -117,17 +117,8 @@ namespace svt
return nMinLength;
}
-
//= RoadmapWizard
-
-
#ifdef DBG_UTIL
- const char* CheckInvariants( const void* pVoid )
- {
- return static_cast< const RoadmapWizard* >( pVoid )->checkInvariants();
- }
-
-
const sal_Char* RoadmapWizard::checkInvariants() const
{
// all paths have to start with the same state
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 16e7507..395737c 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -123,26 +123,10 @@ namespace svt { namespace table
}
};
-
//= UnoControlTableModel
-
-#ifdef DBG_UTIL
- const char* UnoControlTableModel::checkInvariants() const
- {
- Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel );
- if ( !xDataModel.is() )
- return "data model anymore";
-
- // TODO: more?
-
- return NULL;
- }
-#endif
-
#define DBG_CHECK_ME() \
DBG_TESTSOLARMUTEX(); \
-
UnoControlTableModel::UnoControlTableModel()
:m_pImpl( new UnoControlTableModel_Impl )
{
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index db711d3..6433511 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -152,10 +152,6 @@ namespace svt { namespace table
*/
void notifyAllDataChanged() const;
-#ifdef DBG_UTIL
- const char* checkInvariants() const;
-#endif
-
private:
void impl_notifyTableMetricsChanged() const;
};
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dbfb7d4..e2d35c2 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -171,7 +171,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mailmerge \
sw/uiconfig/swriter/ui/mmaddressblockpage \
- sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
sw/uiconfig/swriter/ui/mmmailbody \
sw/uiconfig/swriter/ui/mmmergepage \
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index e9a5a34..9aaea8c 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -186,10 +186,6 @@ public:
/// Count words in current selection.
void CountWords( SwDocStat& rStat ) const;
- /** Delete non-visible content in the document.
- E.g. hidden ranges, hidden paragraphs. */
- bool RemoveInvisibleContent();
-
/// Replace fields by text - mailmerge support.
bool ConvertFieldsToText();
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 4ec7dd0..620a98f 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -748,14 +748,6 @@ SvNumberFormatter* SwEditShell::GetNumberFormatter()
return GetDoc()->GetNumberFormatter();
}
-bool SwEditShell::RemoveInvisibleContent()
-{
- StartAllAction();
- bool bRet = GetDoc()->RemoveInvisibleContent();
- EndAllAction();
- return bRet;
-}
-
bool SwEditShell::ConvertFieldsToText()
{
StartAllAction();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index bf67726..94fdcc2 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -270,11 +270,6 @@ bool DocxSdrExport::IsDrawingOpen()
return m_pImpl->m_bDrawingOpen;
}
-bool DocxSdrExport::isParagraphSdtOpen()
-{
- return m_pImpl->m_bParagraphSdtOpen;
-}
-
void DocxSdrExport::setParagraphSdtOpen(bool bParagraphSdtOpen)
{
m_pImpl->m_bParagraphSdtOpen = bParagraphSdtOpen;
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 8ee6cd7..31ca965 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -64,8 +64,6 @@ public:
/// Same, as DocxAttributeOutput::m_bBtLr, but for textframe rotation.
bool getFrameBtLr();
- /// Is paragraph sdt open in the current drawing?
- bool isParagraphSdtOpen();
/// Set if paragraph sdt open in the current drawing.
void setParagraphSdtOpen(bool bParagraphSdtOpen);
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index f9a3e16..c242d39 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -42,41 +42,6 @@ PrintMonitor::PrintMonitor(Window *pParent, PrintMonitorType eType )
m_pPrinting->Show();
}
-// Progress Indicator for Creation of personalized Mail Merge documents:
-CreateMonitor::CreateMonitor( Window *pParent )
- : CancelableModelessDialog(pParent, "MMCreatingDialog",
- "modules/swriter/ui/mmcreatingdialog.ui")
- , m_sCountingPattern()
- , m_sVariable_Total("%Y")
- , m_sVariable_Position("%X")
- , m_nTotalCount(0)
- , m_nCurrentPosition(0)
-{
- get(m_pCounting, "progress");
- m_sCountingPattern = m_pCounting->GetText();
- m_pCounting->SetText("...");
-}
-
-void CreateMonitor::UpdateCountingText()
-{
- OUString sText(m_sCountingPattern);
- sText = sText.replaceAll( m_sVariable_Total, OUString::number( m_nTotalCount ) );
- sText = sText.replaceAll( m_sVariable_Position, OUString::number( m_nCurrentPosition ) );
- m_pCounting->SetText(sText);
-}
-
-void CreateMonitor::SetTotalCount( sal_Int32 nTotal )
-{
- m_nTotalCount = nTotal;
- UpdateCountingText();
-}
-
-void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent )
-{
- m_nCurrentPosition = nCurrent;
- UpdateCountingText();
-}
-
CancelableModelessDialog::CancelableModelessDialog( Window *pParent,
const OString& rID, const OUString& rUIXMLDescription )
: ModelessDialog( pParent , rID, rUIXMLDescription )
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 58f17ec..361d1af 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -1075,24 +1075,6 @@ void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
}
}
-Sequence< Any > SwMailMergeConfigItem::GetSelection() const
-{
- Sequence< Any > aRet(m_aSelection.getLength());
- sal_Int32 nRetIndex = 0;
- sal_Int32 nRet;
- for(sal_Int32 nIndex = 0; nIndex < m_aSelection.getLength(); ++nIndex)
- {
- m_aSelection[nIndex] >>= nRet;
- if(nRet > 0)
- {
- aRet[nRetIndex] <<= nRet;
- ++nRetIndex;
- }
- }
- aRet.realloc(nRetIndex);
- return aRet;
-}
-
const uno::Sequence< OUString>&
SwMailMergeConfigItem::GetSavedDocuments() const
{
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 4e613ec..3877ac2 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -53,27 +53,6 @@ public:
PrintMonitor( Window *pParent, PrintMonitorType eType );
};
-class CreateMonitor : public CancelableModelessDialog
-{
-public:
- CreateMonitor( Window *pParent );
-
- void SetTotalCount( sal_Int32 nTotal );
- void SetCurrentPosition( sal_Int32 nCurrent );
-
-private:
- void UpdateCountingText();
-
-private:
- FixedText* m_pCounting;
-
- OUString m_sCountingPattern;
- OUString m_sVariable_Total;
- OUString m_sVariable_Position;
- sal_Int32 m_nTotalCount;
- sal_Int32 m_nCurrentPosition;
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index f930064..feeaed8 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -102,8 +102,6 @@ public:
OUString& GetFilter() const;
void SetFilter(OUString&);
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>
- GetSelection()const;
void SetSelection(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection);
void SetCurrentDBData( const SwDBData& rDBData);
diff --git a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
deleted file mode 100644
index 6572c8c..0000000
--- a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="MMCreatingDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Mail Merge</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Status:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Progress:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Creating documents...</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="progress">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%X of %Y</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">cancel</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/unusedcode.easy b/unusedcode.easy
index b24e0b3..ee2ddaf 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
-DocxSdrExport::isParagraphSdtOpen()
GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty()
@@ -212,8 +211,4 @@ std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThr
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
svgio::svgreader::SvgDocument::removeSvgStyleAttributesFromMapper(rtl::OUString const&)
-svl::GridPrinter::clear()
-svl::GridPrinter::resize(unsigned long, unsigned long)
-svt::CheckInvariants(void const*)
-svt::table::UnoControlTableModel::checkInvariants() const
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index d01190e..ea8a10c 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -66,11 +66,6 @@ WrapPolygon::Points_t::iterator WrapPolygon::end()
return mPoints.end();
}
-size_t WrapPolygon::size() const
-{
- return mPoints.size();
-}
-
WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint)
{
WrapPolygon::Pointer_t pResult(new WrapPolygon);
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index a855c02..af6fdde 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -49,8 +49,6 @@ public:
Points_t::iterator begin();
Points_t::iterator end();
- size_t size() const;
-
WrapPolygon::Pointer_t move(const css::awt::Point & rMove);
WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize);
More information about the Libreoffice-commits
mailing list