[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 16 07:22:28 PDT 2012
binfilter/bf_sd/source/filter/sd_sdfilter.cxx | 28 --------------------
binfilter/bf_svtools/source/config/svt_saveopt.cxx | 6 ----
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx | 16 -----------
binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx | 9 ------
binfilter/inc/bf_sd/sdfilter.hxx | 2 -
binfilter/inc/bf_svtools/saveopt.hxx | 2 -
binfilter/inc/bf_svx/xmleohlp.hxx | 5 ---
7 files changed, 68 deletions(-)
New commits:
commit af20ea3f8376a9d29d00d06b106fc49ca85377af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 22:37:43 2012 +0100
callcatcher: remove newly unused code
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 6dcf962..01a84a7 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -77,34 +77,6 @@ SdFilter::~SdFilter()
// -----------------------------------------------------------------------------
-void SdFilter::CreateStatusIndicator()
-{
- try
- {
- if (mxModel.is())
- {
- Reference< XController > xController( mxModel->getCurrentController());
- if( xController.is())
- {
- Reference< XFrame > xFrame( xController->getFrame());
- if( xFrame.is())
- {
- Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY );
- if( xFactory.is())
- {
- mxStatusIndicator = xFactory->createStatusIndicator();
- }
- }
- }
- }
- }
- catch( Exception& )
- {
- }
-}
-
-// -----------------------------------------------------------------------------
-
void SdFilter::CreateProgress()
{
mpProgress = new SfxProgress( &mrDocShell, String( SdResId( STR_LOAD_DOC ) ), 100 );
diff --git a/binfilter/bf_svtools/source/config/svt_saveopt.cxx b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
index 14b5aeb..0799517 100644
--- a/binfilter/bf_svtools/source/config/svt_saveopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
@@ -115,7 +115,6 @@ public:
BOOL IsSaveRelINet() const { return bSaveRelINet; }
BOOL IsSaveRelFSys() const { return bSaveRelFSys; }
BOOL IsSaveUnpacked() const { return bSaveUnpacked; }
- sal_Bool IsPrettyPrintingEnabled( ) const { return bDoPrettyPrinting; }
sal_Bool IsWarnAlienFormat() const { return bWarnAlienFormat; }
sal_Bool IsLoadDocPrinter() const { return bLoadDocPrinter; }
};
@@ -619,11 +618,6 @@ sal_Bool SvtSaveOptions::IsLoadUserSettings() const
return pImp->pLoadOpt->IsLoadUserSettings();
}
-sal_Bool SvtSaveOptions::IsPrettyPrinting() const
-{
- return pImp->pSaveOpt->IsPrettyPrintingEnabled();
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index 0d12b29..74752c9 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -600,22 +600,6 @@ struct OUStringLess
/*N*/ meCreateMode = eCreateMode;
/*N*/ }
-// -----------------------------------------------------------------------------
-
-/*N*/ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
-/*N*/ SvStorage& rRootStorage,
-/*N*/ SvPersist& rDocPersist,
-/*N*/ SvXMLEmbeddedObjectHelperMode eCreateMode,
-/*N*/ sal_Bool /*bDirect*/ )
-/*N*/ {
-/*N*/ SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper;
-/*N*/
-/*N*/ pThis->acquire();
-/*N*/ pThis->Init( &rRootStorage, rDocPersist, eCreateMode );
-/*N*/
-/*N*/ return pThis;
-/*N*/ }
-
/*N*/ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
/*N*/ SvPersist& rDocPersist,
/*N*/ SvXMLEmbeddedObjectHelperMode eCreateMode )
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
index 471fcde..f549b79 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
@@ -561,15 +561,6 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
SdXMLImport::~SdXMLImport() throw ()
{
-// #80365# removed ending of progress bar here, this was an old implementation
-// and maybe removed on demand
-// // stop progress view
-// if(mxStatusIndicator.is())
-// {
-// mxStatusIndicator->end();
-// mxStatusIndicator->reset();
-// }
-
// Styles or AutoStyles context?
if(mpMasterStylesContext)
mpMasterStylesContext->ReleaseRef();
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 98bd862..db0b9f2 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -49,7 +49,6 @@ class SdFilter
protected:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
protected:
@@ -60,7 +59,6 @@ protected:
sal_Bool mbIsDraw : 1;
sal_Bool mbShowProgress : 1;
- void CreateStatusIndicator();
void CreateProgress();
public:
diff --git a/binfilter/inc/bf_svtools/saveopt.hxx b/binfilter/inc/bf_svtools/saveopt.hxx
index c2f2cb7..046c43c 100644
--- a/binfilter/inc/bf_svtools/saveopt.hxx
+++ b/binfilter/inc/bf_svtools/saveopt.hxx
@@ -71,8 +71,6 @@ public:
sal_Bool IsSaveUnpacked() const;
sal_Bool IsLoadUserSettings() const;
-
- sal_Bool IsPrettyPrinting( ) const;
};
}
diff --git a/binfilter/inc/bf_svx/xmleohlp.hxx b/binfilter/inc/bf_svx/xmleohlp.hxx
index de41e25..ae99425 100644
--- a/binfilter/inc/bf_svx/xmleohlp.hxx
+++ b/binfilter/inc/bf_svx/xmleohlp.hxx
@@ -116,11 +116,6 @@ public:
SvXMLEmbeddedObjectHelperMode eCreateMode );
static SvXMLEmbeddedObjectHelper* Create(
- SvStorage& rRootStorage,
- SvPersist& rDocPersist,
- SvXMLEmbeddedObjectHelperMode eCreateMode,
- sal_Bool bDirect = sal_True );
- static SvXMLEmbeddedObjectHelper* Create(
SvPersist& rDocPersist,
SvXMLEmbeddedObjectHelperMode eCreateMode );
static void Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper );
More information about the Libreoffice-commits
mailing list