summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/UIConfig_swriter.mk1
-rw-r--r--sw/inc/editsh.hxx4
-rw-r--r--sw/source/core/edit/editsh.cxx8
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx5
-rw-r--r--sw/source/filter/ww8/docxsdrexport.hxx2
-rw-r--r--sw/source/uibase/dbui/dbui.cxx35
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx18
-rw-r--r--sw/source/uibase/inc/dbui.hxx21
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx2
-rw-r--r--sw/uiconfig/swriter/ui/mmcreatingdialog.ui116
10 files changed, 0 insertions, 212 deletions
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dbfb7d4b578e..e2d35c2b076a 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 e9a5a343be9b..9aaea8ca7ad6 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 4ec7dd0882b6..620a98f42b5c 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 bf677269283e..94fdcc2b0135 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 8ee6cd7756cd..31ca9654265b 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 f9a3e16007cd..c242d39f60cd 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 58f17ecbf727..361d1af0b7ad 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 4e613ec0c155..3877ac21153b 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 f9300646b49f..feeaed83610f 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 6572c8ce965c..000000000000
--- 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>
generated by cgit (git 2.34.1) at 2025-02-27 13:43:56 +0000