connectivity/source/drivers/mork/MResultSet.cxx | 3
connectivity/source/drivers/mork/MResultSet.hxx | 1
cui/source/inc/numpages.hxx | 6 -
cui/source/tabpages/numpages.cxx | 4 -
dbaccess/source/ui/inc/querycontroller.hxx | 1
dbaccess/source/ui/querydesign/querycontroller.cxx | 4 -
filter/source/xsltdialog/xmlfiltercommon.hxx | 1
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 1
forms/source/xforms/xformsevent.cxx | 6 -
forms/source/xforms/xformsevent.hxx | 3
framework/inc/uielement/statusbarmanager.hxx | 1
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 3
framework/source/uielement/statusbarmanager.cxx | 12 +--
sc/source/core/data/table3.cxx | 44 +++---------
sc/source/filter/html/htmlexp.cxx | 21 -----
sc/source/filter/html/htmlexp2.cxx | 6 -
sc/source/filter/inc/htmlexp.hxx | 6 -
svtools/source/contnr/imivctl.hxx | 1
svtools/source/contnr/imivctl1.cxx | 2
sw/source/ui/dbui/mmresultdialogs.cxx | 8 --
sw/source/ui/inc/mmresultdialogs.hxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 19 -----
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 1
24 files changed, 37 insertions(+), 121 deletions(-)
New commits:
commit e0aed1459513be5e08fab9de06848df5dc9d0b5f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 16:02:43 2017 +0200
unused m_sNoSubjectST/m_sDefaultAttachmentST in SwMMResultEmailDialog
ever since
commit ba0796b331247b27886384377c480e413c3ee83d
Date: Wed Dec 23 17:43:14 2015 +0100
mailmerge: Killed the 'Save, print or send' page.
Change-Id: Id77cd6beb3eaa13ead848495d9f8661c83f60975
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index a53affbf99d2..c4000892c7bc 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -434,9 +434,7 @@ void SwMMResultEmailDialog::FillInEmailSettings()
if (m_pAttachmentED->GetText().isEmpty())
{
- OUString sAttach(m_sDefaultAttachmentST);
- sAttach += ".";
- sAttach += lcl_GetExtensionForDocType(
+ OUString sAttach = "." + lcl_GetExtensionForDocType(
reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData()));
m_pAttachmentED->SetText(sAttach);
@@ -1012,10 +1010,10 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl,
Button*, pButton, void)
ScopedVclPtrInstance<SwSendQueryBox_Impl> aQuery(pButton,
"SubjectDialog",
"modules/swriter/ui/subjectdialog.ui");
aQuery->SetIsEmptyTextAllowed(true);
- aQuery->SetValue(m_sNoSubjectST);
+ aQuery->SetValue("");
if(RET_OK == aQuery->Execute())
{
- if(aQuery->GetValue() != m_sNoSubjectST)
+ if(!aQuery->GetValue().isEmpty())
m_pSubjectED->SetText(aQuery->GetValue());
}
else
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx
b/sw/source/ui/inc/mmresultdialogs.hxx
index 4593af32c80a..77c71ca8a394 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -125,8 +125,6 @@ class SwMMResultEmailDialog : public SfxModalDialog
VclPtr<Button> m_pOKButton;
- OUString m_sDefaultAttachmentST;
- OUString m_sNoSubjectST;
OUString m_sConfigureMail;
OUString m_sCC;
commit e159f8b128a9fd1eda8e499e12304aaef97bd7e0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 15:52:32 2017 +0200
unused maFilterService in filter_info_impl
since it was added in
commit d0d152d4e3e99c41dd71187eca917470c4d64adf
Date: Fri Apr 4 15:34:02 2003 +0000
INTEGRATION: CWS xmlfilter01 (1.1.2); FILE ADDED
Change-Id: I69bf6cad4e3d637c065d967a2b5915312cc23e93
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx
b/filter/source/xsltdialog/xmlfiltercommon.hxx
index 4089993bb905..3d87a3e6bce3 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -42,7 +42,6 @@ public:
OUString maFilterName;
OUString maType;
OUString maDocumentService;
- OUString maFilterService;
OUString maInterfaceName;
OUString maComment;
OUString maExtension;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 60045efce674..b8de50691605 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1511,7 +1511,6 @@ bool filter_info_impl::operator==( const
filter_info_impl& r ) const
return maFilterName == r.maFilterName &&
maType == r.maType &&
maDocumentService == r.maDocumentService &&
- maFilterService == r.maFilterService &&
maInterfaceName == r.maInterfaceName &&
maComment == r.maComment &&
maExtension == r.maExtension &&
commit 31d7894d8b0a08fca8bf8b08c2c0296b48b64f5f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 15:50:14 2017 +0200
unused aDDLastRectPos in SvxIconChoiceCtrl_Impl
since
commit bf2373daf50595c02741f63d941fda0462535d62
Date: Tue Jul 26 23:32:40 2011 +0200
callcatcher: remove unused methods
Change-Id: I2eef2bdcd40d4b4b1da8cf7ca95b0194ea99216f
diff --git a/svtools/source/contnr/imivctl.hxx
b/svtools/source/contnr/imivctl.hxx
index 1684d2290836..5b8c816eb1f8 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -167,7 +167,6 @@ class SvxIconChoiceCtrl_Impl
Size aImageSize;
Size aDefaultTextSize;
Size aOutputSize; // Pixel
- Point aDDLastRectPos;
VclPtr<SvtIconChoiceCtrl> pView;
IcnCursor_Impl* pImpCursor;
IcnGridMap_Impl* pGridMap;
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index c1d96f4e8cc2..424b080ff213 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2024,7 +2024,7 @@ void SvxIconChoiceCtrl_Impl::HideDDIcon()
{
Size aSize( pDDDev->GetOutputSizePixel() );
// restore pView
- pView->DrawOutDev( aDDLastRectPos, aSize, Point(), aSize, *pDDDev );
+ pView->DrawOutDev( Point(), aSize, Point(), aSize, *pDDDev );
}
pDDBufDev = pDDDev;
pDDDev = nullptr;
commit dff3e4887d1aa99801fdc70cd6253fb490617407
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:35:06 2017 +0200
unused fields in XFormsEventConcrete
ever since
commit 6297bf4e24bd48b52083ca711ac9930f60bf85c8
Date: Wed Mar 23 10:39:28 2005 +0000
INTEGRATION: CWS eforms4 (1.1.2); FILE ADDED
Change-Id: Ic4915a9b31c3a5f0222da0a4fc8557b2cbe6078e
diff --git a/forms/source/xforms/xformsevent.cxx
b/forms/source/xforms/xformsevent.cxx
index d65b5b0e73ca..e51beb8c52ab 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -40,12 +40,12 @@ OUString SAL_CALL XFormsEventConcrete::getType()
css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL
XFormsEventConcrete::getTarget()
{
- return m_target;
+ return css::uno::Reference< css::xml::dom::events::XEventTarget >();
}
css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL
XFormsEventConcrete::getCurrentTarget()
{
- return m_currentTarget;
+ return css::uno::Reference< css::xml::dom::events::XEventTarget >();
}
css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase()
@@ -65,7 +65,7 @@ sal_Bool SAL_CALL XFormsEventConcrete::getCancelable()
css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp()
{
- return m_time;
+ return css::util::Time();
}
void SAL_CALL XFormsEventConcrete::stopPropagation()
diff --git a/forms/source/xforms/xformsevent.hxx
b/forms/source/xforms/xformsevent.hxx
index db163295dc88..d9d03d385a8a 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -63,11 +63,8 @@ class XFormsEventConcrete : public cppu::WeakImplHelper<
XFormsEvent > {
protected:
OUString m_eventType;
- css::uno::Reference< css::xml::dom::events::XEventTarget > m_target;
- css::uno::Reference< css::xml::dom::events::XEventTarget >
m_currentTarget;
bool m_bubbles;
bool m_cancelable;
- css::util::Time m_time;
};
} } } }
commit 4174b5b08b461db489f681c1366e5c01b86013ca
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:28:22 2017 +0200
unused m_aModuleIdentifier in StatusBarManager
Change-Id: I1f8260fd148b694337ea0440eb2edde4753b34c1
diff --git a/framework/inc/uielement/statusbarmanager.hxx
b/framework/inc/uielement/statusbarmanager.hxx
index bbafb5f55f43..e2c4966c091b 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -95,7 +95,6 @@ class StatusBarManager final: public ::cppu::WeakImplHelper<
m_bFrameActionRegistered : 1,
m_bUpdateControllers : 1;
VclPtr<StatusBar>
m_pStatusBar;
- OUString
m_aModuleIdentifier;
css::uno::Reference< css::frame::XFrame >
m_xFrame;
StatusBarControllerMap
m_aControllerMap;
osl::Mutex
m_mutex;
diff --git a/framework/source/uielement/statusbarmanager.cxx
b/framework/source/uielement/statusbarmanager.cxx
index 176f0d5b33a3..9caa46cc539d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -307,7 +307,7 @@ void StatusBarManager::CreateControllers()
aPropVector.push_back( uno::makeAny( aPropValue ) );
aPropValue.Name = "ModuleIdentifier";
- aPropValue.Value <<= m_aModuleIdentifier;
+ aPropValue.Value <<= OUString();
aPropVector.push_back( uno::makeAny( aPropValue ) );
aPropValue.Name = "Frame";
@@ -336,7 +336,7 @@ void StatusBarManager::CreateControllers()
// 1) UNO Statusbar controllers, registered in Controllers.xcu
if ( m_xStatusbarControllerFactory.is() &&
- m_xStatusbarControllerFactory->hasController( aCommandURL,
m_aModuleIdentifier ))
+ m_xStatusbarControllerFactory->hasController( aCommandURL, "" ))
{
xController.set(m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext(
aCommandURL, aArgs, m_xContext ),
@@ -447,7 +447,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference<
container::XIndexAcc
if (( nType == css::ui::ItemType::DEFAULT ) &&
!aCommandURL.isEmpty() )
{
- OUString aString(
vcl::CommandInfoProvider::GetLabelForCommand(aCommandURL, m_aModuleIdentifier));
+ OUString aString(
vcl::CommandInfoProvider::GetLabelForCommand(aCommandURL, ""));
StatusBarItemBits nItemBits(
impl_convertItemStyleToItemBits( nStyle ));
m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset
);
@@ -474,7 +474,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference<
container::XIndexAcc
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
MergeStatusbarInstruction &rInstruction = aMergeInstructions[i];
- if ( !StatusbarMerger::IsCorrectContext(
rInstruction.aMergeContext, m_aModuleIdentifier ) )
+ if ( !StatusbarMerger::IsCorrectContext(
rInstruction.aMergeContext, "" ) )
continue;
AddonStatusbarItemContainer aItems;
@@ -486,7 +486,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference<
container::XIndexAcc
StatusbarMerger::ProcessMergeOperation( m_pStatusBar,
nRefPos,
nItemId,
- m_aModuleIdentifier,
+ "",
rInstruction.aMergeCommand,
rInstruction.aMergeCommandParameter,
aItems );
@@ -495,7 +495,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference<
container::XIndexAcc
{
StatusbarMerger::ProcessMergeFallback( m_pStatusBar,
nItemId,
- m_aModuleIdentifier,
+ "",
rInstruction.aMergeCommand,
rInstruction.aMergeCommandParameter,
aItems );
commit b92068bbe2a907b6e1fa9637ee5740f6daed75a8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:26:43 2017 +0200
unused m_aModuleIdentifier in UIConfigurationManager
Change-Id: Idd4ced156201e81ee818d4b6b69e6c4d254f3387
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 17a585b210a3..dcfd7227bc98 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -188,7 +188,6 @@ private:
OUString m_aXMLPostfix;
OUString m_aPropUIName;
OUString
m_aPropResourceURL;
- OUString
m_aModuleIdentifier;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
osl::Mutex m_mutex;
cppu::OMultiTypeInterfaceContainerHelper
m_aListenerContainer; /// container for ALL Listener
@@ -1149,7 +1148,7 @@ Reference< XInterface > SAL_CALL
UIConfigurationManager::getImageManager()
Sequence<Any> aPropSeq(comphelper::InitAnyPropertySequence(
{
{"UserConfigStorage", Any(m_xDocConfigStorage)},
- {"ModuleIdentifier", Any(m_aModuleIdentifier)},
+ {"ModuleIdentifier", Any(OUString())},
}));
xInit->initialize( aPropSeq );
commit e86b07e292dc91d67a72a56e7cc15b8c2a9694a9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:15:31 2017 +0200
unused m_sUpdateTableName in OQueryController
ever since
commit 2106d8e648449d34b195068eef5f672a14ea64a8
Date: Sun Jun 10 21:51:19 2012 +0100
callcatcher: update unused code
Change-Id: I88a13c5c414a86a82efc6883d2e1602199569dc9
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx
b/dbaccess/source/ui/inc/querycontroller.hxx
index e0c6b452b81c..3817398ddaeb 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -72,7 +72,6 @@ namespace dbaui
OUString m_sStatement; // contains the current sql
statement
OUString m_sUpdateCatalogName; // catalog for update data
OUString m_sUpdateSchemaName; // schema for update data
- OUString m_sUpdateTableName; // table for update data
mutable OUString
m_sName; // name of the query
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 1ab8782d4034..331147134f1a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1284,7 +1284,7 @@ void OQueryController::executeQuery()
{ PROPERTY_ACTIVE_CONNECTION, makeAny(getConnection())
},
{ PROPERTY_UPDATE_CATALOGNAME,
makeAny(m_sUpdateCatalogName) },
{ PROPERTY_UPDATE_SCHEMANAME,
makeAny(m_sUpdateSchemaName) },
- { PROPERTY_UPDATE_TABLENAME,
makeAny(m_sUpdateTableName) },
+ { PROPERTY_UPDATE_TABLENAME, makeAny(OUString()) },
{ PROPERTY_ESCAPE_PROCESSING,
makeAny(m_bEscapeProcessing) }
}));
@@ -1461,7 +1461,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs)
if ( editingQuery() )
{
- xQuery->setPropertyValue( PROPERTY_UPDATE_TABLENAME, makeAny(
m_sUpdateTableName ) );
+ xQuery->setPropertyValue( PROPERTY_UPDATE_TABLENAME, makeAny(
OUString() ) );
xQuery->setPropertyValue( PROPERTY_ESCAPE_PROCESSING,
css::uno::makeAny( m_bEscapeProcessing ) );
xQuery->setPropertyValue( PROPERTY_LAYOUTINFORMATION,
getViewData() );
commit a0aff40f3e0c91aaae51802bca4b6b77f18ae848
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:06:26 2017 +0200
unused sNumCharFmtName fields
ever since
commit 89ef4dea325a11c706ff9619ff4717124260f864
Date: Fri Jul 17 10:34:58 2015 +0200
loplugin:unusedmethods cui
Change-Id: Ibfa3841168448d4f08075a684fa36262b303210f
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 7b12d8d00879..68d63f72e8da 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -87,15 +87,14 @@ class SvxSingleNumPickTabPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
- VclPtr<SvxNumValueSet> m_pExamplesVS;
+ VclPtr<SvxNumValueSet> m_pExamplesVS;
SvxNumSettingsArr_Impl aNumSettingsArr;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- sal_uInt16 nActNumLvl;
+ sal_uInt16 nActNumLvl;
bool bModified : 1;
bool bPreset : 1;
- OUString sNumCharFmtName;
sal_uInt16 nNumItemId;
protected:
@@ -209,7 +208,6 @@ class SvxBitmapPickTabPage : public SfxTabPage
VclPtr<Button> m_pBtBrowseFile;
std::vector<OUString> aGrfNames;
- OUString sNumCharFmtName;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a50dba3c49e4..0a3f2857c39c 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -349,7 +349,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl,
ValueSet*, void)
aFmt.SetSuffix( "" );
else
aFmt.SetSuffix(_pSet->sSuffix);
- aFmt.SetCharFormatName(sNumCharFmtName);
+ aFmt.SetCharFormatName("");
aFmt.SetBulletRelSize(100);
pActNum->SetLevel(i, aFmt);
}
@@ -957,7 +957,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl,
ValueSet*, void)
aFmt.SetNumberingType(SVX_NUM_BITMAP);
aFmt.SetPrefix( "" );
aFmt.SetSuffix( "" );
- aFmt.SetCharFormatName( sNumCharFmtName );
+ aFmt.SetCharFormatName( "" );
Graphic aGraphic;
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS,
nIdx, &aGraphic))
commit 6c5fdc30851f261ad8f70cb23ead82c4cbe46bb8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 14:02:32 2017 +0200
unused m_nFetchSize in OResultSet
since initial
commit 77e4adbe4759f21f6cf095d954391a9ddbbec2cf
Date: Mon Sep 17 22:50:49 2012 +0200
mork driver implementation
Change-Id: I226c4065a5ab4404cc9e99eb3e026d153d1ccf08
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx
b/connectivity/source/drivers/mork/MResultSet.cxx
index b3bf3b790fc4..c510fff3255f 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -71,7 +71,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const
std::shared_ptr< connectiv
,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bWasNull(false)
- ,m_nFetchSize(0)
,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
,m_nFetchDirection(FetchDirection::FORWARD)
,m_pSQLIterator( _pSQLIterator )
@@ -607,7 +606,7 @@ void OResultSet::getFastPropertyValue(
rValue <<= m_nFetchDirection;
break;
case PROPERTY_ID_FETCHSIZE:
- rValue <<= m_nFetchSize;
+ rValue <<= (sal_Int32)0;
break;
case PROPERTY_ID_ISBOOKMARKABLE:
const_cast< OResultSet* >( this )->determineReadOnly();
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx
b/connectivity/source/drivers/mork/MResultSet.hxx
index febe6a0a4bf7..1a3c8f9d7598 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -79,7 +79,6 @@ namespace connectivity
css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData;
sal_uInt32 m_nRowPos;
bool m_bWasNull;
- sal_Int32 m_nFetchSize;
sal_Int32 m_nResultSetType;
sal_Int32 m_nFetchDirection;
commit 0c9f104390032d99517e9bd1e16333fcc5fa472f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 13:56:06 2017 +0200
unused bPageToggle in GraphicImport_Impl
ever since
commit 0929dfa83ca4dbc675c74854566ce4e25def0dbd
Date: Sat Jan 11 11:54:14 2014 +0100
writerfilter: drop never generated rtf
{XAlign,FHDR,YAlign,XRelTo,YRelTo}
Change-Id: Icabe9ff848e3cc9918741e9c68d8f2312145fb74
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index be000432868a..553a4e86a8f5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -191,7 +191,6 @@ public:
sal_Int16 nHoriOrient;
sal_Int16 nHoriRelation;
- bool bPageToggle;
sal_Int16 nVertOrient;
sal_Int16 nVertRelation;
text::WrapTextMode nWrap;
@@ -257,7 +256,6 @@ public:
,zOrder(-1)
,nHoriOrient( text::HoriOrientation::NONE )
,nHoriRelation( text::RelOrientation::FRAME )
- ,bPageToggle( false )
,nVertOrient( text::VertOrientation::NONE )
,nVertRelation( text::RelOrientation::FRAME )
,nWrap(text::WrapTextMode_NONE)
@@ -345,7 +343,7 @@ public:
xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_HORI_ORIENT_RELATION ),
uno::makeAny(nHoriRelation));
xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_PAGE_TOGGLE ),
- uno::makeAny(bPageToggle));
+ uno::makeAny(false));
if (!bRelativeOnly)
xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_VERT_ORIENT_POSITION),
uno::makeAny(nTopPosition));
commit beebcb8ee0b47172978a23d8d555859daf0f4474
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 13:54:41 2017 +0200
unused bVertFlip/bHoriFlip in GraphicImport_Impl
ever since
commit 4a924576e415f16e0571542bb0d683529f9046ff
Date: Wed Jan 15 20:24:41 2014 +0100
writerfilter: drop unused BlipDib and FSP in doctok
Change-Id: I9bf644bdc4b37cb6c4a9a9ab7757c4a83a520cd7
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 65a20747c38f..be000432868a 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -225,9 +225,6 @@ public:
bool bIsGraphic;
- bool bHoriFlip;
- bool bVertFlip;
-
bool bSizeProtected;
bool bPositionProtected;
@@ -284,8 +281,6 @@ public:
,eColorMode( drawing::ColorMode_STANDARD )
,nCurrentBorderLine(BORDER_TOP)
,bIsGraphic(false)
- ,bHoriFlip(false)
- ,bVertFlip(false)
,bSizeProtected(false)
,bPositionProtected(false)
,nShapeOptionType(0)
@@ -1293,17 +1288,7 @@ uno::Reference< text::XTextContent >
GraphicImport::createGraphicObject( const b
if(m_pImpl->fGamma > 0. )
xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_GAMMA ),
uno::makeAny(m_pImpl->fGamma ));
- if(m_pImpl->bHoriFlip)
- {
- xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_HORI_MIRRORED_ON_EVEN_PAGES ),
- uno::makeAny( m_pImpl->bHoriFlip ));
- xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_HORI_MIRRORED_ON_ODD_PAGES ),
- uno::makeAny( m_pImpl->bHoriFlip ));
- }
- if( m_pImpl->bVertFlip )
- xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_VERT_MIRRORED ),
- uno::makeAny( m_pImpl->bVertFlip ));
xGraphicObjectProperties->setPropertyValue(getPropertyName(
PROP_BACK_COLOR ),
uno::makeAny( m_pImpl->nFillColor ));
commit 1c0cbc87f23f228f66dc22428cddd7e395c1119a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 13:50:10 2017 +0200
unused m_xStorage in RTFDocumentImpl
ever since introduction in
commit 328d154015f8cb733ed62d793bbbc31eb4cc971b
Date: Fri Jun 10 18:56:08 2011 +0200
resolvePict: import the stream as a graphic object
Change-Id: Ife03094d721621cc592be9cd94899a4e40550330
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f9afa8acfe44..59ea16061a84 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -301,7 +301,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
if (xDocumentPropertiesSupplier.is())
m_xDocumentProperties.set(xDocumentPropertiesSupplier->getDocumentProperties(),
uno::UNO_QUERY);
- m_pGraphicHelper.reset(new oox::GraphicHelper(m_xContext, xFrame,
m_xStorage));
+ m_pGraphicHelper.reset(new oox::GraphicHelper(m_xContext, xFrame,
oox::StorageRef()));
m_pTokenizer.reset(new RTFTokenizer(*this, m_pInStream.get(),
m_xStatusIndicator));
m_pSdrImport.reset(new RTFSdrImport(*this, m_xDstDoc));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index c2834268499e..8756e5fd071c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -551,7 +551,6 @@ private:
/// The settings table sprms.
RTFSprms m_aSettingsTableSprms;
- oox::StorageRef m_xStorage;
std::shared_ptr<oox::GraphicHelper> m_pGraphicHelper;
/// cell props buffer for nested tables, reset by \nestrow
commit 107524b99f087af9bea02e2d4e61a04a8c3ecbe0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 13:36:41 2017 +0200
unused aCId in ScHTMLExport
ever since
commit fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55
Date: Tue May 31 10:30:35 2016 +0200
remove unused SID constants and associated code
Change-Id: I47388fa5dcfec67bbcd9f7bf0a079d9376bc05af
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index b1ef63c92c2b..18361ebe8035 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -593,8 +593,6 @@ void ScHTMLExport::WriteBody()
aGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
aGrfNm, URIHelper::GetMaybeFileHdl());
- if ( HasCId() )
- MakeCIdURL( aGrfNm );
aLink = aGrfNm;
}
}
@@ -602,11 +600,9 @@ void ScHTMLExport::WriteBody()
else
{
aGrfNm = aLink;
- if( bCopyLocalFileToINet || HasCId() )
+ if( bCopyLocalFileToINet )
{
CopyLocalFileToINet( aGrfNm, aStreamPath );
- if ( HasCId() )
- MakeCIdURL( aGrfNm );
}
else
aGrfNm = URIHelper::SmartRel2Abs(
@@ -1319,21 +1315,6 @@ void ScHTMLExport::CopyLocalFileToINet( OUString&
rFileNm,
}
}
-void ScHTMLExport::MakeCIdURL( OUString& rURL )
-{
- if( aCId.isEmpty() )
- return;
-
- INetURLObject aURLObj( rURL );
- if( INetProtocol::File != aURLObj.GetProtocol() )
- return;
-
- OUString aLastName( aURLObj.GetLastName().toAsciiLowerCase() );
- OSL_ENSURE( !aLastName.isEmpty(), "filename without length!" );
-
- rURL = "cid:" + aLastName + "." + aCId;
-}
-
void ScHTMLExport::IncIndent( short nVal )
{
sIndent[nIndent] = '\t';
diff --git a/sc/source/filter/html/htmlexp2.cxx
b/sc/source/filter/html/htmlexp2.cxx
index 493a4ddced41..f9698694633c 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -195,19 +195,15 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const
Graphic& rGrf,
INetURLObject(aBaseURL),
aGrfNm,
URIHelper::GetMaybeFileHdl());
- if ( HasCId() )
- MakeCIdURL( rLinkName );
}
}
}
else
{
// Linked graphic - figure out the URL for the IMG tag
- if( bCopyLocalFileToINet || HasCId() )
+ if( bCopyLocalFileToINet )
{
CopyLocalFileToINet( rLinkName, aStreamPath );
- if ( HasCId() )
- MakeCIdURL( rLinkName );
}
else
rLinkName = URIHelper::SmartRel2Abs(
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index e685a9f13d4d..011b0d30b650 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -108,7 +108,6 @@ class ScHTMLExport : public ScExportBase
ScHTMLStyle aHTMLStyle;
OUString aBaseURL;
OUString aStreamPath;
- OUString aCId; // Content-Id for Mail-Export
VclPtr<OutputDevice> pAppWin; // for Pixel-work
FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet
OUString aNonConvertibleChars; // collect nonconvertible
characters
@@ -144,11 +143,6 @@ class ScHTMLExport : public ScExportBase
// copy a local file to internet if needed
void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm );
- bool HasCId()
- {
- return !aCId.isEmpty();
- }
- void MakeCIdURL( OUString& rURL );
void PrepareGraphics( ScDrawLayer*, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow,
commit 4819162e452ff96f2a2e652a48a7bc3bfa3bc400
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Sep 19 11:46:59 2017 +0200
simplify calling listeners
Change-Id: I4bf0d378003d1f54685f6c55c0314c117b243526
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3b1a1c393a9b..64234dbd9781 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -665,30 +665,6 @@ public:
}
};
-class StartListeningNotifier
-{
- sc::RefStartListeningHint maHint;
-public:
- StartListeningNotifier() {}
-
- void operator() ( SvtListener* p )
- {
- p->Notify(maHint);
- }
-};
-
-class StopListeningNotifier
-{
- sc::RefStopListeningHint maHint;
-public:
- StopListeningNotifier() {}
-
- void operator() ( SvtListener* p )
- {
- p->Notify(maHint);
- }
-};
-
class FormulaGroupPosCollector
{
sc::RefQueryFormulaGroup& mrQuery;
@@ -933,8 +909,9 @@ void ScTable::SortReorderByColumn(
/* TODO: for performance this could be enhanced to stop and later
* restart only listening to within the reordered range and keep
* listening to everything outside untouched. */
- StopListeningNotifier aFunc;
- std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+ sc::RefStopListeningHint aHint;
+ for (auto const & l : aCellListeners)
+ l->Notify(aHint);
}
// table to keep track of column index to position in the index table.
@@ -1024,8 +1001,9 @@ void ScTable::SortReorderByColumn(
else // !(pArray->IsUpdateRefs())
{
// Notify the cells' listeners to (re-)start listening.
- StartListeningNotifier aFunc;
- std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+ sc::RefStartListeningHint aHint;
+ for (auto const & l : aCellListeners)
+ l->Notify(aHint);
}
// Re-join formulas at row boundaries now that all the references have
@@ -1079,8 +1057,9 @@ void ScTable::SortReorderByRow(
* restart only listening to within the reordered range and keep
* listening to everything outside untouched. */
{
- StopListeningNotifier aFunc;
- std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+ sc::RefStopListeningHint aHint;
+ for (auto const & l : aCellListeners)
+ l->Notify(aHint);
}
// Split formula groups at the sort range boundaries (if applicable).
@@ -1172,8 +1151,9 @@ void ScTable::SortReorderByRow(
// Notify the cells' listeners to (re-)start listening.
{
- StartListeningNotifier aFunc;
- std::for_each(aCellListeners.begin(), aCellListeners.end(), aFunc);
+ sc::RefStartListeningHint aHint;
+ for (auto const & l : aCellListeners)
+ l->Notify(aHint);
}
// Re-group columns in the sorted range too.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
