[Libreoffice-commits] core.git: basctl/source basegfx/source connectivity/source cui/source editeng/source framework/inc framework/Library_fwi.mk framework/source include/basegfx include/editeng include/sfx2 include/svtools include/svx include/tools include/vcl rsc/inc sc/inc sc/Library_scfilt.mk sc/source sd/inc sd/source sfx2/source svtools/source svx/source sw/Library_sw.mk sw/source ucb/source vcl/source writerfilter/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Oct 18 06:16:18 UTC 2016
basctl/source/basicide/bastype2.cxx | 13 -
basctl/source/inc/bastype2.hxx | 2
basegfx/source/polygon/b2dpolygontools.cxx | 66 ------
basegfx/source/polygon/b2dtrapezoid.cxx | 33 ---
connectivity/source/drivers/firebird/Connection.hxx | 8
cui/source/inc/cuitabarea.hxx | 18 -
cui/source/tabpages/tpcolor.cxx | 40 ---
cui/source/tabpages/tpgradnt.cxx | 62 -----
editeng/source/items/numitem.cxx | 5
framework/Library_fwi.mk | 1
framework/inc/helper/networkdomain.hxx | 40 ---
framework/source/fwi/helper/networkdomain.cxx | 206 -------------------
include/basegfx/polygon/b2dpolygontools.hxx | 3
include/basegfx/polygon/b2dtrapezoid.hxx | 8
include/editeng/numitem.hxx | 1
include/sfx2/tbxctrl.hxx | 2
include/svtools/toolbarmenu.hxx | 2
include/svtools/valueset.hxx | 4
include/svx/dlgctrl.hxx | 9
include/svx/nbdtmg.hxx | 37 ---
include/svx/sidebar/ValueSetWithTextControl.hxx | 9
include/tools/resmgr.hxx | 4
include/vcl/builder.hxx | 2
include/vcl/spinfld.hxx | 2
include/vcl/svapp.hxx | 8
rsc/inc/rscdb.hxx | 4
sc/Library_scfilt.mk | 1
sc/inc/document.hxx | 1
sc/source/core/data/documen2.cxx | 5
sc/source/filter/inc/addressconverter.hxx | 2
sc/source/filter/inc/biffcodec.hxx | 3
sc/source/filter/inc/biffinputstream.hxx | 18 -
sc/source/filter/inc/drawingmanager.hxx | 73 ------
sc/source/filter/inc/excelhandlers.hxx | 35 ---
sc/source/filter/inc/formulabase.hxx | 2
sc/source/filter/inc/numberformatsbuffer.hxx | 2
sc/source/filter/inc/pivotcachebuffer.hxx | 5
sc/source/filter/inc/pivotcachefragment.hxx | 25 --
sc/source/filter/oox/addressconverter.cxx | 14 -
sc/source/filter/oox/biffinputstream.cxx | 11 -
sc/source/filter/oox/commentsbuffer.cxx | 1
sc/source/filter/oox/drawingmanager.cxx | 56 -----
sc/source/filter/oox/excelhandlers.cxx | 20 -
sc/source/filter/oox/formulabase.cxx | 24 --
sc/source/filter/oox/numberformatsbuffer.cxx | 5
sc/source/filter/oox/pivotcachebuffer.cxx | 100 ---------
sc/source/filter/oox/pivotcachefragment.cxx | 74 ------
sc/source/filter/oox/worksheetfragment.cxx | 1
sc/source/filter/oox/worksheethelper.cxx | 1
sc/source/ui/inc/navipi.hxx | 8
sd/inc/TransitionPreset.hxx | 2
sd/source/core/TransitionPreset.cxx | 11 -
sfx2/source/toolbox/tbxitem.cxx | 16 -
svtools/source/control/toolbarmenu.cxx | 6
svtools/source/control/valueset.cxx | 20 -
svx/source/dialog/dlgctrl.cxx | 95 --------
svx/source/sidebar/nbdtmg.cxx | 42 ---
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 29 --
sw/Library_sw.mk | 1
sw/source/uibase/sidebar/PageColumnControl.cxx | 1
sw/source/uibase/sidebar/PageColumnControl.hxx | 2
sw/source/uibase/sidebar/PageMarginControl.cxx | 3
sw/source/uibase/sidebar/PageMarginControl.hxx | 2
sw/source/uibase/sidebar/PageOrientationControl.hxx | 2
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 63 -----
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 63 -----
sw/source/uibase/sidebar/PageSizeControl.cxx | 3
sw/source/uibase/sidebar/PageSizeControl.hxx | 2
ucb/source/ucp/webdav-neon/DAVTypes.cxx | 53 ----
ucb/source/ucp/webdav-neon/DAVTypes.hxx | 16 -
vcl/source/app/svapp.cxx | 5
vcl/source/control/spinfld.cxx | 6
writerfilter/source/dmapper/PropertyMap.hxx | 1
73 files changed, 7 insertions(+), 1513 deletions(-)
New commits:
commit 292560a957498bed70b625c992ec6bcf631dceb3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Oct 17 13:23:23 2016 +0200
loplugin:unusedmethods
Change-Id: Icf773925c37dde8b7404edac9864e7b10fe113b4
Reviewed-on: https://gerrit.libreoffice.org/29968
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index af5ab34..7b836c8 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -157,23 +157,10 @@ EntryDescriptor::EntryDescriptor (
OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor: invalid document!" );
}
-// TreeListBox
-TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes)
- : SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>( rRes.GetId() ) ) )
- , m_aNotifier( *this )
-{
- Init();
-}
-
TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
, m_aNotifier( *this )
{
- Init();
-}
-
-void TreeListBox::Init()
-{
SetNodeDefaultImages();
SetSelectionMode( SelectionMode::Single );
nMode = 0xFF; // everything
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index e289221..60a8bd5 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -174,7 +174,6 @@ class TreeListBox : public SvTreeListBox, public DocumentEventListener
private:
sal_uInt16 nMode;
DocumentEventNotifier m_aNotifier;
- void Init();
void SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
@@ -204,7 +203,6 @@ protected:
virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
public:
- TreeListBox(vcl::Window* pParent, const ResId& rRes);
TreeListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~TreeListBox() override;
virtual void dispose() override;
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index d473668..23e01233 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -40,7 +40,6 @@
// #i37443#
#define ANGLE_BOUND_START_VALUE (2.25)
#define ANGLE_BOUND_MINIMUM_VALUE (0.1)
-#define COUNT_SUBDIVIDE_DEFAULT (4)
#ifdef DBG_UTIL
static double fAngleBoundStartValue = ANGLE_BOUND_START_VALUE;
#endif
@@ -322,71 +321,6 @@ namespace basegfx
}
}
- B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount)
- {
- if(rCandidate.areControlPointsUsed())
- {
- const sal_uInt32 nPointCount(rCandidate.count());
- B2DPolygon aRetval;
-
- if(nPointCount)
- {
- // prepare edge-oriented loop
- const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
- B2DCubicBezier aBezier;
- aBezier.setStartPoint(rCandidate.getB2DPoint(0));
-
- // perf: try to avoid too many realloctions by guessing the result's pointcount
- aRetval.reserve(nPointCount*4);
-
- // add start point (always)
- aRetval.append(aBezier.getStartPoint());
-
- // #i37443# prepare convenient count if none was given
- if(0 == nCount)
- {
- nCount = COUNT_SUBDIVIDE_DEFAULT;
- }
-
- for(sal_uInt32 a(0); a < nEdgeCount; a++)
- {
- // get next and control points
- const sal_uInt32 nNextIndex((a + 1) % nPointCount);
- aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
- aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
- aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
- aBezier.testAndSolveTrivialBezier();
-
- if(aBezier.isBezier())
- {
- // call adaptive subdivide
- aBezier.adaptiveSubdivideByCount(aRetval, nCount);
- }
- else
- {
- // add non-curved edge
- aRetval.append(aBezier.getEndPoint());
- }
-
- // prepare next step
- aBezier.setStartPoint(aBezier.getEndPoint());
- }
-
- if(rCandidate.isClosed())
- {
- // set closed flag and correct last point (which is added double now).
- closeWithGeometryChange(aRetval);
- }
- }
-
- return aRetval;
- }
- else
- {
- return rCandidate;
- }
- }
-
bool isInside(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
{
const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 33d5886..21c5c86 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -1178,39 +1178,6 @@ namespace basegfx
}
}
- void createLineTrapezoidFromB2DPolyPolygon(
- B2DTrapezoidVector& ro_Result,
- const B2DPolyPolygon& rPolyPolygon,
- double fLineWidth)
- {
- if(fTools::lessOrEqual(fLineWidth, 0.0))
- {
- return;
- }
-
- // ensure there are no curves used
- B2DPolyPolygon aSource(rPolyPolygon);
-
- if(aSource.areControlPointsUsed())
- {
- aSource = aSource.getDefaultAdaptiveSubdivision();
- }
-
- const sal_uInt32 nCount(aSource.count());
-
- if(!nCount)
- {
- return;
- }
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- createLineTrapezoidFromB2DPolygon(
- ro_Result,
- aSource.getB2DPolygon(a),
- fLineWidth);
- }
- }
} // end of namespace tools
} // end of namespace basegfx
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 3367303..a8b3527 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -155,14 +155,6 @@ namespace connectivity
/** Statements owned by this connection. */
OWeakRefArray m_aStatements;
- /**
- * Firebird stores binary collations for indexes on Character based
- * columns, these can be binary-incompatible between different icu
- * version, hence we need to rebuild the indexes when switching icu
- * versions.
- */
- void rebuildIndexes()
- throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void buildTypeInfo()
throw (css::sdbc::SQLException);
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 21a8fb3..52d4fce 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -82,11 +82,6 @@ class ButtonBox
if(nPos != -1)
SelectButtonImpl(nPos);
}
- void clear()
- {
- mnCurrentButton = NO_BUTTON_SELECTED;
- maButtonList.clear();
- };
};
enum class PageType
@@ -146,14 +141,6 @@ public:
void SetNewColorList( XColorListRef const & pColorList )
{ mpNewColorList = pColorList; }
const XColorListRef& GetNewColorList() const { return mpNewColorList; }
-
- const XGradientListRef& GetNewGradientList() const
- { return mpNewGradientList; }
-
- const XHatchListRef& GetNewHatchingList() const
- { return mpNewHatchingList; }
-
- const XBitmapListRef& GetNewBitmapList() const { return mpNewBitmapList; }
};
/************************************************************************/
@@ -430,7 +417,6 @@ private:
DECL_LINK( ChangeAutoStepHdl_Impl, CheckBox&, void );
DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void );
void ModifiedHdl_Impl(void*);
- long CheckChanges_Impl();
void SetControlState_Impl( css::awt::GradientStyle eXGS );
sal_Int32 SearchGradientList(const OUString& rGradientName);
@@ -605,7 +591,6 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges() { return pBitmapRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -661,7 +646,6 @@ private:
DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void );
DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
- long CheckChanges_Impl();
sal_Int32 SearchPatternList(const OUString& rPatternName);
public:
@@ -802,8 +786,6 @@ public:
void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
void SetPos( sal_Int32* pInPos ) { pPos = pInPos; }
void SetColorList( const XColorListRef& pColList );
- void SaveToViewFrame( SfxViewFrame *pViewFrame );
- void SetupForViewFrame( SfxViewFrame *pViewFrame );
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 9f06f9c..aa16ce6 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -760,46 +760,6 @@ void SvxColorTabPage::FillUserData()
}
-void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
-{
- const OfaRefItem<XColorList> *pPtr = nullptr;
- if ( pViewFrame != nullptr && pViewFrame->GetDispatcher() )
- pPtr = static_cast<const OfaRefItem<XColorList> *>(pViewFrame->
- GetDispatcher()->Execute( SID_GET_COLORLIST,
- SfxCallMode::SYNCHRON ));
- pColorList = pPtr ? pPtr->GetValue() : XColorList::GetStdColorList();
-
- //SetPos( &pShadow->nUnknownPos );
- //SetColorChgd( &pShadow->nChangeType );
- Construct();
-}
-
-void SvxColorTabPage::SaveToViewFrame( SfxViewFrame *pViewFrame )
-{
- if( !pColorList.is() )
- return;
-
- if( !pViewFrame )
- return;
-
- // notify current viewframe that it uses the same color table
- if ( !pViewFrame->GetDispatcher() )
- return;
-
- const OfaRefItem<XColorList> * pPtr;
- pPtr = static_cast<const OfaRefItem<XColorList>*>(pViewFrame->GetDispatcher()->Execute( SID_GET_COLORLIST, SfxCallMode::SYNCHRON ));
- if( pPtr )
- {
- XColorListRef pReference = pPtr->GetValue();
-
- if( pReference.is() &&
- pReference->GetPath() == pColorList->GetPath() &&
- pReference->GetName() == pColorList->GetName() )
- SfxObjectShell::Current()->PutItem( SvxColorListItem( pColorList,
- SID_COLOR_TABLE ) );
- }
-}
-
void SvxColorTabPage::SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef )
{
(void) t;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index d1b50c7..68d2871 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -252,68 +252,6 @@ DeactivateRC SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-long SvxGradientTabPage::CheckChanges_Impl()
-{
- // is used here in order to NOT lose changes
- XGradient aTmpGradient( m_pLbColorFrom->GetSelectEntryColor(),
- m_pLbColorTo->GetSelectEntryColor(),
- (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(),
- static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource
- (sal_uInt16) m_pMtrCenterX->GetValue(),
- (sal_uInt16) m_pMtrCenterY->GetValue(),
- (sal_uInt16) m_pMtrBorder->GetValue(),
- (sal_uInt16) m_pMtrColorFrom->GetValue(),
- (sal_uInt16) m_pMtrColorTo->GetValue() );
-
- size_t nPos = m_pGradientLB->GetSelectItemPos();
- if( nPos != VALUESET_ITEM_NOTFOUND )
- {
- XGradient aGradient = m_pGradientList->GetGradient( static_cast<sal_uInt16>(nPos) )->GetGradient();
-
- if( !( aTmpGradient == aGradient ) )
- {
- ResMgr& rMgr = CUI_MGR();
- Image aWarningBoxImage = WarningBox::GetStandardImage();
- ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
- SVX_RESSTR( RID_SVXSTR_GRADIENT ),
- CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
- &aWarningBoxImage );
- assert(aMessDlg && "Dialog creation failed!");
- aMessDlg->SetButtonText( SvxMessDialogButton::N1,
- OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( SvxMessDialogButton::N2,
- OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) );
-
- short nRet = aMessDlg->Execute();
-
- switch( nRet )
- {
- case RET_BTN_1:
- {
- ClickModifyHdl_Impl( nullptr );
- }
- break;
-
- case RET_BTN_2:
- {
- ClickAddHdl_Impl( nullptr );
- }
- break;
-
- case RET_CANCEL:
- break;
- }
- }
- }
- nPos = m_pGradientLB->GetSelectItemPos();
- if( nPos != VALUESET_ITEM_NOTFOUND )
- {
- *m_pPos = static_cast<sal_Int32>(nPos);
- }
- return 0L;
-}
-
-
bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
{
std::unique_ptr<XGradient> pXGradient;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 92e9a3b..ad62a5c 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -427,11 +427,6 @@ void SvxNumberFormat::SetGraphic( const OUString& rName )
aGraphicSize.Width() = aGraphicSize.Height() = 0;
}
-void SvxNumberFormat::SetVertOrient(sal_Int16 eSet)
-{
- eVertOrient = eSet;
-}
-
sal_Int16 SvxNumberFormat::GetVertOrient() const
{
return eVertOrient;
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 8435b9d..ed8dfb2 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
framework/source/fwi/classes/converter \
framework/source/fwi/classes/protocolhandlercache \
framework/source/fwi/helper/mischelper \
- framework/source/fwi/helper/networkdomain \
framework/source/fwi/helper/shareablemutex \
framework/source/fwi/jobs/configaccess \
framework/source/fwi/jobs/jobconst \
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
deleted file mode 100644
index 08d1ce4..0000000
--- a/framework/inc/helper/networkdomain.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
-#define INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
-
-#include <rtl/ustring.hxx>
-#include <fwidllapi.h>
-
-namespace framework
-{
-
-class FWI_DLLPUBLIC NetworkDomain
-{
- public:
- static OUString GetNTDomainName();
- static OUString GetYPDomainName();
-};
-
-}
-
-#endif // INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
deleted file mode 100644
index eb99975..0000000
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <helper/networkdomain.hxx>
-
-#ifdef _WIN32
-
-// Windows
-
-#define UNICODE
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize )
-{
- return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize );
-}
-
-static OUString GetUserDomain()
-{
- sal_Unicode aBuffer[256];
- DWORD nResult;
-
- nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) );
-
- if ( nResult > 0 )
- return OUString( aBuffer );
- else
- return OUString();
-}
-
-// Windows
-
-namespace framework
-{
-
-OUString NetworkDomain::GetYPDomainName()
-{
- return OUString();
-}
-
-OUString NetworkDomain::GetNTDomainName()
-{
- return GetUserDomain();
-}
-
-}
-
-#elif defined( UNIX )
-
-#include <rtl/ustring.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <osl/thread.h>
-
-// Unix
-
-#if defined( SOLARIS )
-
-// Solaris
-
-#include <sys/systeminfo.h>
-#include <sal/alloca.h>
-
-static rtl_uString *getDomainName()
-{
- /* Initialize and assume failure */
- rtl_uString *ustrDomainName = NULL;
-
- char szBuffer[256];
-
- long nCopied = sizeof(szBuffer);
- char *pBuffer = szBuffer;
- long nBufSize;
-
- do
- {
- nBufSize = nCopied;
- nCopied = sysinfo( SI_SRPC_DOMAIN, pBuffer, nBufSize );
-
- /* If nCopied is greater than buffersize we need to allocate
- a buffer with suitable size */
-
- if ( nCopied > nBufSize )
- pBuffer = (char *)alloca( nCopied );
-
- } while ( nCopied > nBufSize );
-
- if ( -1 != nCopied )
- {
- rtl_string2UString(
- &ustrDomainName,
- pBuffer,
- nCopied - 1,
- osl_getThreadTextEncoding(),
- OSTRING_TO_OUSTRING_CVTFLAGS );
- }
-
- return ustrDomainName;
-}
-
-#elif defined( LINUX ) /* endif SOLARIS */
-
-// Linux
-
-#include <unistd.h>
-#include <string.h>
-
-static rtl_uString *getDomainName()
-{
- /* Initialize and assume failure */
- rtl_uString *ustrDomainName = nullptr;
-
- char buffer[256]; // actually the man page says 65 bytes should be enough
-
- /* If buffersize is not large enough the name is truncated. */
- int const result = getdomainname( &buffer[0], SAL_N_ELEMENTS(buffer) );
-
- if ( 0 == result )
- {
- rtl_string2UString(
- &ustrDomainName,
- &buffer[0],
- strlen( &buffer[0] ),
- osl_getThreadTextEncoding(),
- OSTRING_TO_OUSTRING_CVTFLAGS );
- }
-
- return ustrDomainName;
-}
-
-#else /* LINUX */
-
-// Other Unix
-
-static rtl_uString *getDomainName()
-{
- return nullptr;
-}
-
-#endif
-
-// Unix
-
-namespace framework
-{
-
-OUString NetworkDomain::GetYPDomainName()
-{
- rtl_uString* pResult = getDomainName();
- if ( pResult )
- return OUString( pResult );
- else
- return OUString();
-}
-
-OUString NetworkDomain::GetNTDomainName()
-{
- return OUString();
-}
-
-}
-
-#else /* UNIX */
-
-// Other operating systems (non-Windows and non-Unix)
-
-namespace framework
-{
-
-OUString NetworkDomain::GetYPDomainName()
-{
- return OUString();
-}
-
-OUString NetworkDomain::GetNTDomainName()
-{
- return OUString();
-}
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index f73e02a..b96834f 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -137,9 +137,6 @@ namespace basegfx
// Subdivide all contained curves. Use angleBound value if given.
BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon& rCandidate, double fAngleBound = 0.0);
- // #i37443# Subdivide all contained curves.
- BASEGFX_DLLPUBLIC B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount);
-
// This version works with two points and vectors to define the
// edges for the cut test.
BASEGFX_DLLPUBLIC CutFlagValue findCut(
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index f838a63..e026367 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -104,14 +104,6 @@ namespace basegfx
const B2DPolygon& rPolygon,
double fLineWidth);
- // create trapezoids for all edges of the given polyPolygon. The closed state of
- // the tools::PolyPolygon is taken into account. If curves are contaned, the default
- // AdaptiveSubdivision will be used.
- BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolyPolygon(
- B2DTrapezoidVector& ro_Result,
- const B2DPolyPolygon& rPolyPolygon,
- double fLineWidth);
-
} // end of namespace tools
} // end of namespace basegfx
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index c789f00..e687246 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -181,7 +181,6 @@ public:
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = nullptr, const sal_Int16* pOrient = nullptr);
const SvxBrushItem* GetBrush() const {return pGraphicBrush;}
void SetGraphic( const OUString& rName );
- virtual void SetVertOrient(sal_Int16 eSet);
virtual sal_Int16 GetVertOrient() const;
void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;}
const Size& GetGraphicSize() const {return aGraphicSize;}
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 6185ce7..151b4a2 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -91,8 +91,6 @@ protected:
sal_uInt16 GetId() const { return m_nId; }
const css::uno::Reference< css::frame::XFrame >& GetFrame() const { return m_xFrame; }
- void BindListener();
- void UnbindListener();
void AddStatusListener( const OUString& rCommandURL );
virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent );
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 840c641..58e0b9d 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -110,8 +110,6 @@ public:
int getSelectedEntryId() const;
int getHighlightedEntryId() const;
- void highlightFirstEntry();
-
protected:
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index c4fe6b1..b676f8d 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -241,8 +241,6 @@ private:
friend class ValueItemAcc;
using Control::ImplInitSettings;
- using Window::ImplInit;
- SVT_DLLPRIVATE void ImplInit();
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
@@ -281,7 +279,6 @@ protected:
public:
ValueSet( vcl::Window* pParent, WinBits nWinStyle );
- ValueSet( vcl::Window* pParent, const ResId& rResId );
virtual ~ValueSet() override;
virtual void dispose() override;
@@ -353,7 +350,6 @@ public:
}
void SaveValue() { mnSavedItemId = GetSelectItemId(); }
sal_Int32 GetSavedValue() const { return mnSavedItemId; }
- bool IsValueChangedFromSaved() { return mnSavedItemId != GetSelectItemId(); }
bool IsItemSelected( sal_uInt16 nItemId ) const
{
return !mbNoSelection && (nItemId == mnSelItemId);
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 8d92361..ae7ecfb 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -227,8 +227,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC HatchingLB : public ListBox
XHatchListRef mpList;
public:
explicit HatchingLB(vcl::Window* pParent, WinBits aWB);
-
- void Fill( const XHatchListRef &pList );
};
/************************************************************************/
@@ -238,11 +236,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC GradientLB : public ListBox
XGradientListRef mpList;
public:
explicit GradientLB(vcl::Window* pParent, WinBits aWB);
-
- void Fill( const XGradientListRef &pList );
-
- void SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
- const XGradient& rXGradient );
};
/************************************************************************/
@@ -252,8 +245,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC BitmapLB : public ListBox
public:
explicit BitmapLB(vcl::Window* pParent, WinBits aWB);
- void Fill(const XBitmapListRef &pList);
-
private:
BitmapEx maBitmapEx;
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index e87b9b8..8813a36 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -102,41 +102,6 @@ class SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
virtual ~BulletsSettings_Impl() override {}
};
-class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings
-{
- public:
- OUString sGrfName;
- sal_uInt16 nTabIndex;
- sal_uInt16 nGallaryIndex;
- const Graphic* pGrfObj;
- Size aSize;
- GrfBulDataRelation(NBType eTy):
- BulletsSettings(eTy),
- nTabIndex((sal_uInt16)0xFFFF),
- nGallaryIndex((sal_uInt16)0xFFFF),
- pGrfObj(nullptr),
- aSize(0,0)
- {}
- virtual ~GrfBulDataRelation() override {}
-};
-
-class SVX_DLLPUBLIC MixBulletsSettings_Impl
-{
- public:
- NBType eType;
- sal_uInt16 nIndex; //index in the tab page display
- sal_uInt16 nIndexDefault;
- BulletsSettings* pBullets;
- public:
- MixBulletsSettings_Impl(NBType eTy) :
- eType(eTy),
- nIndex((sal_uInt16)0xFFFF),
- nIndexDefault((sal_uInt16)0xFFFF),
- pBullets(nullptr)
- {}
- ~MixBulletsSettings_Impl(){}
-};
-
class SVX_DLLPUBLIC NumberSettings_Impl
{
public:
@@ -230,8 +195,6 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override;
virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override;
virtual bool IsCustomized(sal_uInt16 nIndex) override;
- static sal_Unicode GetBulChar(sal_uInt16 nIndex);
- static vcl::Font GetBulCharFont(sal_uInt16 nIndex);
static BulletsTypeMgr& GetInstance();
};
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index aa745ba..619c77a 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -49,15 +49,6 @@ public:
ValueSetWithTextControl(Window* pParent, WinBits nBits);
- // add item for control type IMAGE_TEXT
- // if control type does not match IMAGE_TEXT no item is added.
- // @param pItemHelpText
- // help text is optional. if not provided, it is the same as the item text
- void AddItem(
- const Image& rItemImage,
- const OUString& rItemText,
- const OUString* pItemHelpText );
-
// add item for control type TEXT_TEXT
// if control type does not match TEXT_TEXT no item is added.
void AddItem(
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index d5a62cb..024c745 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -94,10 +94,6 @@ private:
TOOLS_DLLPRIVATE void incStack();
TOOLS_DLLPRIVATE void decStack();
- TOOLS_DLLPRIVATE const ImpRCStack * StackTop( sal_uInt32 nOff = 0 ) const
- {
- return (((int)nOff >= nCurStack) ? nullptr : &aStack[nCurStack-nOff]);
- }
TOOLS_DLLPRIVATE void Init( const OUString& rFileName );
TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp );
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 02a9018..9c8be70 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -108,8 +108,6 @@ public:
static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
- const css::uno::Reference<css::frame::XFrame>& getFrame() { return m_xFrame; }
-
/// return UI-File name (without '.ui')
const OString& getUIFile() const
{
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index c22e67b..1630aa6 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -56,8 +56,6 @@ private:
SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
protected:
- explicit SpinField( WindowType nTyp );
-
virtual bool Notify( NotifyEvent& rNEvt ) override;
void EndDropDown();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 2886cb5..9bf324c 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1108,14 +1108,6 @@ public:
*/
static void EnableAutoHelpId();
- /** Determines if auto-help is enabled or disabled.
-
- @return true if auto-help is enabled, false if it is disabled.
-
- @see EnableAutoHelpId
- */
- static bool IsAutoHelpIdEnabled();
-
///@}
/** @name Dialogs
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 5536b04..c4663c4 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -146,13 +146,9 @@ class RscTypCont
void SETCONST( RscConst *, const char *, sal_uInt32 );
void SETCONST( RscConst *, Atom, sal_uInt32 );
inline void SETCONST( RscConst *p1, const char * p2, SymbolType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, Atom p2, RSWND p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, const char * p2, ToolBoxItemType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, const char * p2, ButtonType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, const char * p2, WindowAlign p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, SfxStyleFamily p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); }
void InitLangType();
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 625da79..308eecb 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -178,7 +178,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/defnamesbuffer \
sc/source/filter/oox/drawingbase \
sc/source/filter/oox/drawingfragment \
- sc/source/filter/oox/drawingmanager \
sc/source/filter/oox/excelchartconverter \
sc/source/filter/oox/excelhandlers \
sc/source/filter/oox/excelvbaproject \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3994b83..8701a6e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1860,7 +1860,6 @@ public:
const ScMarkData* pMarkData = nullptr );
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
- SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
/** Sort a range of data. */
void Sort(
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d2af6d2..389611d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -482,11 +482,6 @@ SvNumberFormatter* ScDocument::GetFormatTable() const
return xPoolHelper->GetFormTable();
}
-SvNumberFormatter* ScDocument::CreateFormatTable() const
-{
- return xPoolHelper->CreateNumberFormatter();
-}
-
SfxItemPool* ScDocument::GetEditPool() const
{
return xPoolHelper->GetEditPool();
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 4e4ba70..2eafdb5 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -93,7 +93,6 @@ struct BinAddress
inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm );
};
inline bool operator<( const BinAddress& rL, const BinAddress& rR )
@@ -114,7 +113,6 @@ struct BinRange
BinAddress maLast;
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm );
};
inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange )
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index 929b3cb..914fb60 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -37,9 +37,6 @@ public:
explicit BiffDecoderBase();
virtual ~BiffDecoderBase() override;
- /** Derived classes return a clone of the decoder for usage in new streams. */
- inline BiffDecoderBase* clone() { return implClone(); }
-
/** Implementation of the ::comphelper::IDocPasswordVerifier interface. */
virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override;
virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override;
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index cf620d1..f5c52f7 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -143,18 +143,6 @@ public:
*/
bool startNextRecord();
- /** Sets stream pointer to the start of the content of the specified record.
-
- The handle of the current record can be received and stored using the
- function getRecHandle() for later usage with this function. The record
- handle is equivalent to the position of the underlying binary stream,
- thus the function can be used to perform a hard seek to a specific
- position, if it is sure that a record starts exactly at this position.
-
- @return False = no record found (invalid handle passed).
- */
- bool startRecordByHandle( sal_Int64 nRecHandle );
-
/** Sets stream pointer before current record and invalidates stream.
The next call to startNextRecord() will start again the current record.
@@ -167,12 +155,6 @@ public:
// decoder ----------------------------------------------------------------
- /** Sets a new decoder object.
-
- Enables decryption of record contents for the rest of the stream.
- */
- void setDecoder( const BiffDecoderRef& rxDecoder );
-
/** Enables/disables usage of current decoder.
Decryption is reenabled automatically, if a new record is started using
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
deleted file mode 100644
index e4f07a5..0000000
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGMANAGER_HXX
-#define INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGMANAGER_HXX
-
-#include "drawingbase.hxx"
-
-namespace com { namespace sun { namespace star {
- namespace drawing { class XDrawPage; }
- namespace drawing { class XShape; }
- namespace drawing { class XShapes; }
-} } }
-
-namespace oox { namespace drawingml { class ShapePropertyMap; } }
-
-namespace oox {
-namespace xls {
-
-const sal_uInt16 BIFF_OBJ_INVALID_ID = 0;
-
-// BIFF drawing objects
-class BiffDrawingBase;
-
-// BIFF drawing page
-
-/** Base class for a container for all objects on a drawing page (in a
- spreadsheet or in an embedded chart object).
-
- For BIFF import, it is needed to load all drawing objects before converting
- them to UNO shapes. There might be some dummy drawing objects (e.g. the
- dropdown buttons of autofilters) which have to be skipped. The information,
- that a drawing object is a dummy object, may be located after the drawing
- objects themselves.
-
- The BIFF8 format stores drawing objects in the DFF stream (stored
- fragmented in MSODRAWING records), and in the OBJ records. The DFF stream
- fragments are collected in a single stream, and the complete stream will be
- processed afterwards.
- */
-class BiffDrawingBase : public WorksheetHelper
-{
-public:
- explicit BiffDrawingBase( const WorksheetHelper& rHelper,
- const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage );
-
-private:
- css::uno::Reference< css::drawing::XDrawPage >
- mxDrawPage; /// UNO draw page used to insert the shapes.
-};
-
-} // namespace xls
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 9e73804..780da03 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -93,41 +93,6 @@ public:
virtual void importRecord( BiffInputStream& rStrm ) = 0;
};
-class BiffFragmentHandler
-{
-public:
- /** Opens the stream with the passed full name. */
- explicit BiffFragmentHandler(
- const ::oox::core::FilterBase& rFilter,
- const OUString& rStrmName );
-
- virtual ~BiffFragmentHandler();
-
-protected:
- /** Returns the BIFF input stream of this fragment. */
- inline BiffInputStream& getInputStream() { return *mxBiffStrm; }
-
- /** Skips the current fragment up to its trailing EOF record.
-
- Skips all records until next EOF record. When this function returns,
- stream points to the EOF record, and the next call of startNextRecord()
- at the stream will start the record following the EOF record.
-
- Embedded fragments enclosed in BOF/EOF records (e.g. embedded chart
- objects) are skipped correctly.
-
- @return True = stream points to the EOF record of the current fragment.
- */
- bool skipFragment();
-
-private:
- typedef std::shared_ptr< BinaryXInputStream > XInputStreamRef;
- typedef std::shared_ptr< BiffInputStream > BiffInputStreamRef;
-
- XInputStreamRef mxXInStrm;
- BiffInputStreamRef mxBiffStrm;
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 1e3a475..f016f2c 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -234,8 +234,6 @@ struct BinSingleRef2d
explicit BinSingleRef2d();
void setBiff12Data( sal_uInt16 nCol, sal_Int32 nRow, bool bRelativeAsOffset );
- void setBiff2Data( sal_uInt8 nCol, sal_uInt16 nRow, bool bRelativeAsOffset );
- void setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset );
void readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset );
};
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 0031177..57861d4 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -72,8 +72,6 @@ public:
const css::uno::Reference< css::util::XNumberFormats >& rxNumFmts,
const css::lang::Locale& rFromLocale );
sal_uLong fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
- /** Writes the number format to the passed property map. */
- void writeToPropertyMap( PropertyMap& rPropMap ) const;
private:
NumFmtModel maModel;
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index 80e2f45..a2b45bc 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -242,8 +242,6 @@ public:
/** Imports one or more group items from the passed record. */
void importPCDFGroupItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
- /** Imports pivot cache field settings from the PCDFIELD record. */
- void importPCDField( BiffInputStream& rStrm );
/** Imports numeric grouping settings from the PCDFRANGEPR record. */
void importPCDFRangePr( BiffInputStream& rStrm );
/** Imports the mapping between group items and base items from the PCDFDISCRETEPR record. */
@@ -389,9 +387,6 @@ public:
/** Reads sheet source settings from the PCDSHEETSOURCE record. */
void importPCDSheetSource( SequenceInputStream& rStrm, const ::oox::core::Relations& rRelations );
- /** Reads pivot cache global settings from the PCDEFINITION record. */
- void importPCDefinition( BiffInputStream& rStrm );
-
/** Creates and returns a new pivot cache field. */
PivotCacheField& createCacheField( bool bInitDatabaseField = false );
/** Checks validity of source data and creates a dummy data sheet for external sheet sources. */
diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx
index e88b82c..ded475e 100644
--- a/sc/source/filter/inc/pivotcachefragment.hxx
+++ b/sc/source/filter/inc/pivotcachefragment.hxx
@@ -88,31 +88,6 @@ private:
bool mbInRecord;
};
-class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase
-{
-public:
- explicit BiffPivotCacheRecordsContext(
- const WorksheetHelper& rHelper,
- const PivotCache& rPivotCache );
-
- /** Reads the current record from stream and tries to insert a cell into
- the source data sheet. */
- virtual void importRecord( BiffInputStream& rStrm ) override;
-
-private:
- void startNextRow();
-
-private:
- typedef ::std::vector< sal_Int32 > ColumnIndexVector;
-
- const PivotCache& mrPivotCache;
- ColumnIndexVector maUnsharedCols; /// Column indexes of all unshared cache fields.
- size_t mnColIdx; /// Current index into maUnsharedCols.
- sal_Int32 mnRowIdx; /// Current row in source data (0-based).
- bool mbHasShared; /// True = pivot cache contains fields with shared items.
- bool mbInRow; /// True = a data row has been started.
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 0d4185c1..6d8c867 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -67,12 +67,6 @@ void BinAddress::read( SequenceInputStream& rStrm )
mnCol = rStrm.readInt32();
}
-void BinAddress::read( BiffInputStream& rStrm )
-{
- mnRow = rStrm.readuInt16();
- mnCol = rStrm.readuInt16();
-}
-
void BinRange::read( SequenceInputStream& rStrm )
{
maFirst.mnRow = rStrm.readInt32();
@@ -81,14 +75,6 @@ void BinRange::read( SequenceInputStream& rStrm )
maLast.mnCol = rStrm.readInt32();
}
-void BinRange::read( BiffInputStream& rStrm )
-{
- maFirst.mnRow = rStrm.readuInt16();
- maLast.mnRow = rStrm.readuInt16();
- maFirst.mnCol = rStrm.readuInt16();
- maLast.mnCol = rStrm.readuInt16();
-}
-
void BinRangeList::read( SequenceInputStream& rStrm )
{
sal_Int32 nCount = rStrm.readInt32();
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index 7d9e8a2..22e7761 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -188,12 +188,6 @@ bool BiffInputStream::startNextRecord()
return isInRecord();
}
-bool BiffInputStream::startRecordByHandle( sal_Int64 nRecHandle )
-{
- rewindToRecord( nRecHandle );
- return startNextRecord();
-}
-
void BiffInputStream::rewindRecord()
{
rewindToRecord( mnRecHandle );
@@ -201,11 +195,6 @@ void BiffInputStream::rewindRecord()
// decoder --------------------------------------------------------------------
-void BiffInputStream::setDecoder( const BiffDecoderRef& rxDecoder )
-{
- maRecBuffer.setDecoder( rxDecoder );
-}
-
void BiffInputStream::enableDecoder()
{
maRecBuffer.enableDecoder( true );
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index f6c146b..098f72c 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -35,7 +35,6 @@
#include "drawingfragment.hxx"
#include <svx/sdtaitm.hxx>
#include "unitconverter.hxx"
-#include "drawingmanager.hxx"
#include <com/sun/star/text/XText.hpp>
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
deleted file mode 100644
index 5810996..0000000
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "drawingmanager.hxx"
-
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/drawing/CircleKind.hpp>
-#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/PolygonKind.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <osl/diagnose.h>
-#include <oox/core/filterbase.hxx>
-#include <oox/drawingml/fillproperties.hxx>
-#include <oox/drawingml/lineproperties.hxx>
-#include <oox/drawingml/shapepropertymap.hxx>
-#include <oox/helper/containerhelper.hxx>
-#include <oox/token/tokens.hxx>
-#include "biffinputstream.hxx"
-#include "unitconverter.hxx"
-
-namespace oox {
-namespace xls {
-
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::oox::drawingml;
-
-// BIFF drawing page
-BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) :
- WorksheetHelper( rHelper ),
- mxDrawPage( rxDrawPage )
-{
-}
-
-} // namespace xls
-} // namespace oox
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index f41dc97..3dbb965 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -47,26 +47,6 @@ BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelp
{
}
-BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName )
-{
- // do not automatically close the root stream (indicated by empty stream name)
- bool bRootStrm = rStrmName.isEmpty();
- mxXInStrm.reset( new BinaryXInputStream( rFilter.openInputStream( rStrmName ), !bRootStrm ) );
- mxBiffStrm.reset( new BiffInputStream( *mxXInStrm ) );
-}
-
-BiffFragmentHandler::~BiffFragmentHandler()
-{
-}
-
-bool BiffFragmentHandler::skipFragment()
-{
- while( mxBiffStrm->startNextRecord() && (mxBiffStrm->getRecId() != BIFF_ID_EOF) )
- if( BiffHelper::isBofRecord( *mxBiffStrm ) )
- skipFragment();
- return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF);
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 3e675a4..fcd792b 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -71,30 +71,6 @@ void BinSingleRef2d::setBiff12Data( sal_uInt16 nCol, sal_Int32 nRow, bool bRelat
mnRow -= (BIFF12_TOK_REF_ROWMASK + 1);
}
-void BinSingleRef2d::setBiff2Data( sal_uInt8 nCol, sal_uInt16 nRow, bool bRelativeAsOffset )
-{
- mnCol = nCol;
- mnRow = nRow & BIFF_TOK_REF_ROWMASK;
- mbColRel = getFlag( nRow, BIFF_TOK_REF_COLREL );
- mbRowRel = getFlag( nRow, BIFF_TOK_REF_ROWREL );
- if( bRelativeAsOffset && mbColRel && (mnCol >= 0x80) )
- mnCol -= 0x100;
- if( bRelativeAsOffset && mbRowRel && (mnRow > (BIFF_TOK_REF_ROWMASK >> 1)) )
- mnRow -= (BIFF_TOK_REF_ROWMASK + 1);
-}
-
-void BinSingleRef2d::setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset )
-{
- mnCol = nCol & BIFF_TOK_REF_COLMASK;
- mnRow = nRow;
- mbColRel = getFlag( nCol, BIFF_TOK_REF_COLREL );
- mbRowRel = getFlag( nCol, BIFF_TOK_REF_ROWREL );
- if( bRelativeAsOffset && mbColRel && (mnCol > (BIFF_TOK_REF_COLMASK >> 1)) )
- mnCol -= (BIFF_TOK_REF_COLMASK + 1);
- if( bRelativeAsOffset && mbRowRel && (mnRow >= 0x8000) )
- mnRow -= 0x10000;
-}
-
void BinSingleRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset )
{
sal_Int32 nRow;
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index ac42d74..f614767 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1970,11 +1970,6 @@ sal_uLong NumberFormat::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs
return nScNumFmt;
}
-void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const
-{
- rPropMap.setProperty( PROP_NumberFormat, maApiData.mnIndex);
-}
-
NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper )
: WorkbookHelper(rHelper)
, mnHighestId(0)
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 56632e7..4a7ca8f 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -102,28 +102,9 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL = 0x08;
const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID = 0x01;
const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02;
-const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF;
-
-const sal_uInt16 BIFF_PCDFIELD_HASITEMS = 0x0001;
-const sal_uInt16 BIFF_PCDFIELD_HASPARENT = 0x0008;
-const sal_uInt16 BIFF_PCDFIELD_RANGEGROUP = 0x0010;
-const sal_uInt16 BIFF_PCDFIELD_ISNUMERIC = 0x0020;
-const sal_uInt16 BIFF_PCDFIELD_HASSEMIMIXED = 0x0080;
-const sal_uInt16 BIFF_PCDFIELD_HASLONGINDEX = 0x0200;
-const sal_uInt16 BIFF_PCDFIELD_HASNONDATE = 0x0400;
-const sal_uInt16 BIFF_PCDFIELD_HASDATE = 0x0800;
-const sal_uInt16 BIFF_PCDFIELD_SERVERFIELD = 0x2000;
-const sal_uInt16 BIFF_PCDFIELD_NOUNIQUEITEMS = 0x4000;
-
const sal_uInt16 BIFF_PCDFRANGEPR_AUTOSTART = 0x0001;
const sal_uInt16 BIFF_PCDFRANGEPR_AUTOEND = 0x0002;
-const sal_uInt16 BIFF_PCDEFINITION_SAVEDATA = 0x0001;
-const sal_uInt16 BIFF_PCDEFINITION_INVALID = 0x0002;
-const sal_uInt16 BIFF_PCDEFINITION_REFRESHONLOAD = 0x0004;
-const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY = 0x0008;
-const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY = 0x0010;
-const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020;
/** Adjusts the weird date format read from binary streams.
@@ -626,63 +607,6 @@ void PivotCacheField::importPCDFGroupItem( sal_Int32 nRecId, SequenceInputStream
maGroupItems.importItem( nRecId, rStrm );
}
-void PivotCacheField::importPCDField( BiffInputStream& rStrm )
-{
- sal_uInt16 nFlags, nGroupItems, nBaseItems, nSharedItems;
- rStrm >> nFlags;
- maFieldGroupModel.mnParentField = rStrm.readuInt16();
- maFieldGroupModel.mnBaseField = rStrm.readuInt16();
- rStrm.skip( 2 ); // number of unique items (either shared or group)
- rStrm >> nGroupItems >> nBaseItems >> nSharedItems;
- maFieldModel.maName = rStrm.readByteStringUC( getTextEncoding() );
-
- maFieldModel.mbServerField = getFlag( nFlags, BIFF_PCDFIELD_SERVERFIELD );
- maFieldModel.mbUniqueList = !getFlag( nFlags, BIFF_PCDFIELD_NOUNIQUEITEMS );
- maSharedItemsModel.mbHasSemiMixed = getFlag( nFlags, BIFF_PCDFIELD_HASSEMIMIXED );
- maSharedItemsModel.mbHasNonDate = getFlag( nFlags, BIFF_PCDFIELD_HASNONDATE );
- maSharedItemsModel.mbHasDate = getFlag( nFlags, BIFF_PCDFIELD_HASDATE );
- maSharedItemsModel.mbIsNumeric = getFlag( nFlags, BIFF_PCDFIELD_ISNUMERIC );
- maSharedItemsModel.mbHasLongIndexes = getFlag( nFlags, BIFF_PCDFIELD_HASLONGINDEX );
- maFieldGroupModel.mbRangeGroup = getFlag( nFlags, BIFF_PCDFIELD_RANGEGROUP );
-
- // in BIFF, presence of parent group field is denoted by a flag
- if( !getFlag( nFlags, BIFF_PCDFIELD_HASPARENT ) )
- maFieldGroupModel.mnParentField = -1;
-
- // following PCDFSQLTYPE record contains SQL type
- if( (rStrm.getNextRecId() == BIFF_ID_PCDFSQLTYPE) && rStrm.startNextRecord() )
- maFieldModel.mnSqlType = rStrm.readInt16();
-
- // read group items, if any
- if( nGroupItems > 0 )
- {
- SAL_WARN_IF(
- !getFlag(nFlags, BIFF_PCDFIELD_HASITEMS), "sc.filter",
- "PivotCacheField::importPCDField - missing items flag");
- maGroupItems.importItemList( rStrm, nGroupItems );
-
- sal_uInt16 nNextRecId = rStrm.getNextRecId();
- bool bHasRangePr = nNextRecId == BIFF_ID_PCDFRANGEPR;
- bool bHasDiscretePr = nNextRecId == BIFF_ID_PCDFDISCRETEPR;
-
- OSL_ENSURE( bHasRangePr || bHasDiscretePr, "PivotCacheField::importPCDField - missing group properties record" );
- OSL_ENSURE( bHasRangePr == maFieldGroupModel.mbRangeGroup, "PivotCacheField::importPCDField - invalid range grouping flag" );
- if( bHasRangePr && rStrm.startNextRecord() )
- importPCDFRangePr( rStrm );
- else if( bHasDiscretePr && rStrm.startNextRecord() )
- importPCDFDiscretePr( rStrm );
- }
-
- // read the shared items, if any
- if( nSharedItems > 0 )
- {
- SAL_WARN_IF(
- !getFlag(nFlags, BIFF_PCDFIELD_HASITEMS), "sc.filter",
- "PivotCacheField::importPCDField - missing items flag");
- maSharedItems.importItemList( rStrm, nSharedItems );
- }
-}
-
void PivotCacheField::importPCDFRangePr( BiffInputStream& rStrm )
{
sal_uInt16 nFlags;
@@ -1167,30 +1091,6 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio
maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId );
}
-void PivotCache::importPCDefinition( BiffInputStream& rStrm )
-{
- sal_uInt16 nFlags, nUserNameLen;
- rStrm >> maDefModel.mnRecords;
- rStrm.skip( 2 ); // repeated cache ID
- rStrm >> nFlags;
- rStrm.skip( 2 ); // unused
- rStrm >> maDefModel.mnDatabaseFields;
- rStrm.skip( 6 ); // total field count, report record count, (repeated) cache type
- rStrm >> nUserNameLen;
- if( nUserNameLen != BIFF_PC_NOSTRING )
- maDefModel.maRefreshedBy = rStrm.readCharArrayUC( nUserNameLen, getTextEncoding() );
-
- maDefModel.mbInvalid = getFlag( nFlags, BIFF_PCDEFINITION_INVALID );
- maDefModel.mbSaveData = getFlag( nFlags, BIFF_PCDEFINITION_SAVEDATA );
- maDefModel.mbRefreshOnLoad = getFlag( nFlags, BIFF_PCDEFINITION_REFRESHONLOAD );
- maDefModel.mbOptimizeMemory = getFlag( nFlags, BIFF_PCDEFINITION_OPTIMIZEMEMORY );
- maDefModel.mbEnableRefresh = getFlag( nFlags, BIFF_PCDEFINITION_ENABLEREFRESH );
- maDefModel.mbBackgroundQuery = getFlag( nFlags, BIFF_PCDEFINITION_BACKGROUNDQUERY );
-
- if( (rStrm.getNextRecId() == BIFF_ID_PCDEFINITION2) && rStrm.startNextRecord() )
- rStrm >> maDefModel.mfRefreshedDate;
-}
-
PivotCacheField& PivotCache::createCacheField( bool bInitDatabaseField )
{
bool bIsDatabaseField = !bInitDatabaseField || (maFields.size() < maDefModel.mnDatabaseFields);
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 4f4498d..5a3a784 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -323,80 +323,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn
}
}
-BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) :
- BiffWorksheetContextBase( rHelper ),
- mrPivotCache( rPivotCache ),
- mnColIdx( 0 ),
- mnRowIdx( 0 ),
- mbHasShared( false ),
- mbInRow( false )
-{
- // prepare sheet: insert column header names into top row
- mrPivotCache.writeSourceHeaderCells( *this );
-
- // find all fields without shared items, remember column indexes in source data
- for( sal_Int32 nFieldIdx = 0, nFieldCount = mrPivotCache.getCacheFieldCount(), nCol = 0; nFieldIdx < nFieldCount; ++nFieldIdx )
- {
- const PivotCacheField* pCacheField = mrPivotCache.getCacheField( nFieldIdx );
- if( pCacheField && pCacheField->isDatabaseField() )
- {
- if( pCacheField->hasSharedItems() )
- mbHasShared = true;
- else
- maUnsharedCols.push_back( nCol );
- ++nCol;
- }
- }
-}
-
-void BiffPivotCacheRecordsContext::importRecord( BiffInputStream& rStrm )
-{
- if( rStrm.getRecId() == BIFF_ID_PCITEM_INDEXLIST )
- {
- OSL_ENSURE( mbHasShared, "BiffPivotCacheRecordsContext::importRecord - unexpected PCITEM_INDEXLIST record" );
- // PCITEM_INDEXLIST record always in front of a new data row
- startNextRow();
- mrPivotCache.importPCItemIndexList( rStrm, *this, mnRowIdx );
- mbInRow = !maUnsharedCols.empty(); // mbInRow remains true, if unshared items are expected
- return;
- }
-
- PivotCacheItem aItem;
- switch( rStrm.getRecId() )
- {
- case BIFF_ID_PCITEM_MISSING: break;
- case BIFF_ID_PCITEM_STRING: aItem.readString( rStrm, *this ); break;
- case BIFF_ID_PCITEM_DOUBLE: aItem.readDouble( rStrm ); break;
- case BIFF_ID_PCITEM_INTEGER: aItem.readInteger( rStrm ); break;
- case BIFF_ID_PCITEM_DATE: aItem.readDate( rStrm ); break;
- case BIFF_ID_PCITEM_BOOL: aItem.readBool( rStrm ); break;
- case BIFF_ID_PCITEM_ERROR: aItem.readError( rStrm ); break;
- default: return; // unknown record, ignore
- }
-
- // find next column index, might start new row if no fields with shared items exist
- if( mbInRow && (mnColIdx == maUnsharedCols.size()) )
- {
- OSL_ENSURE( !mbHasShared, "BiffPivotCacheRecordsContext::importRecord - PCITEM_INDEXLIST record missing" );
- mbInRow = mbHasShared; // do not leave current row if PCITEM_INDEXLIST is expected
- }
- // start next row on first call, or on row wrap without shared items
- if( !mbInRow )
- startNextRow();
-
- // write the item data to the sheet cell
- OSL_ENSURE( mnColIdx < maUnsharedCols.size(), "BiffPivotCacheRecordsContext::importRecord - invalid column index" );
- if( mnColIdx < maUnsharedCols.size() )
- mrPivotCache.writeSourceDataCell( *this, maUnsharedCols[ mnColIdx ], mnRowIdx, aItem );
- ++mnColIdx;
-}
-
-void BiffPivotCacheRecordsContext::startNextRow()
-{
- mnColIdx = 0;
- ++mnRowIdx;
- mbInRow = true;
-}
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index ad9837a..c0998c1 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -31,7 +31,6 @@
#include "commentsfragment.hxx"
#include "condformatcontext.hxx"
#include "drawingfragment.hxx"
-#include "drawingmanager.hxx"
#include "externallinkbuffer.hxx"
#include "pagesettings.hxx"
#include "pivottablefragment.hxx"
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index bb04088..5d20156 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -54,7 +54,6 @@
#include "convuno.hxx"
#include "document.hxx"
#include "drawingfragment.hxx"
-#include "drawingmanager.hxx"
#include "formulaparser.hxx"
#include "pagesettings.hxx"
#include "querytablebuffer.hxx"
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index ac588dd..7a21bf8 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -112,10 +112,6 @@ class ColumnEdit : public SpinField
public:
ColumnEdit(Window* pParent, WinBits nWinBits);
~ColumnEdit() override;
- void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg)
- {
- xDlg = pNaviDlg;
- }
SCCOL GetCol() { return nCol; }
void SetCol( SCCOL nColNo );
@@ -144,10 +140,6 @@ class RowEdit : public NumericField
public:
RowEdit(Window* pParent, WinBits nWinBits);
~RowEdit() override;
- void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg)
- {
- xDlg = pNaviDlg;
- }
SCROW GetRow() { return (SCROW)GetValue(); }
void SetRow(SCROW nRow) { SetValue(nRow); }
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index b51ad39..1d696d5 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -46,8 +46,6 @@ public:
static const TransitionPresetList& getTransitionPresetList();
static bool importTransitionPresetList( TransitionPresetList& rList );
- void apply( SdPage* pSlide ) const;
-
sal_Int16 getTransition() const { return mnTransition; }
sal_Int16 getSubtype() const { return mnSubtype; }
bool getDirection() const { return mbDirection; }
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 83b4c8e..b4dda7d 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -272,17 +272,6 @@ const TransitionPresetList& TransitionPreset::getTransitionPresetList()
return theTransitionPresetList::get().getList();
}
-void TransitionPreset::apply( SdPage* pSlide ) const
-{
- if( pSlide )
- {
- pSlide->setTransitionType( mnTransition );
- pSlide->setTransitionSubtype( mnSubtype );
- pSlide->setTransitionDirection( mbDirection );
- pSlide->setTransitionFadeColor( mnFadeColor );
- }
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 08f0ae9..7dc46f8 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -855,22 +855,6 @@ void SfxPopupWindow::GetOrCreateStatusListener()
}
-void SfxPopupWindow::BindListener()
-{
- GetOrCreateStatusListener();
- if ( m_xStatusListener.is() )
- m_pStatusListener->bindListener();
-}
-
-
-void SfxPopupWindow::UnbindListener()
-{
- GetOrCreateStatusListener();
- if ( m_xStatusListener.is() )
- m_pStatusListener->unbindListener();
-}
-
-
void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL )
{
GetOrCreateStatusListener();
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 6a73703..00eec20 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -674,12 +674,6 @@ Size ToolbarMenu::implCalcSize()
}
-void ToolbarMenu::highlightFirstEntry()
-{
- implChangeHighlightEntry( 0 );
-}
-
-
void ToolbarMenu::GetFocus()
{
if( mpImpl && mpImpl->mnHighlightedEntry == -1 )
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 7b5cfba..d8d79cc 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -55,7 +55,10 @@ enum
}
-void ValueSet::ImplInit()
+ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) :
+ Control( pParent, nWinStyle ),
+ maVirDev( VclPtr<VirtualDevice>::Create(*this) ),
+ maColor( COL_TRANSPARENT )
{
mpNoneItem.reset(nullptr);
mxScrollBar.reset(nullptr);
@@ -95,13 +98,6 @@ void ValueSet::ImplInit()
ImplInitSettings( true, true, true );
}
-ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) :
- Control( pParent, nWinStyle ),
- maVirDev( VclPtr<VirtualDevice>::Create(*this) ),
- maColor( COL_TRANSPARENT )
-{
- ImplInit();
-}
VCL_BUILDER_DECL_FACTORY(ValueSet)
{
@@ -114,14 +110,6 @@ VCL_BUILDER_DECL_FACTORY(ValueSet)
rRet = VclPtr<ValueSet>::Create(pParent, nWinBits);
}
-ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId ) :
- Control( pParent, rResId ),
- maVirDev( VclPtr<VirtualDevice>::Create(*this) ),
- maColor( COL_TRANSPARENT )
-{
- ImplInit();
-}
-
ValueSet::~ValueSet()
{
disposeOnce();
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 570ae38..30ead12 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1169,30 +1169,6 @@ VCL_BUILDER_DECL_FACTORY(HatchingLB)
rRet = pListBox;
}
-void HatchingLB::Fill( const XHatchListRef &pList )
-{
- if( !pList.is() )
- return;
-
- mpList = pList;
- long nCount = pList->Count();
-
- SetUpdateMode( false );
-
- for( long i = 0; i < nCount; i++ )
- {
- const XHatchEntry* pEntry = pList->GetHatch(i);
- const Bitmap aBitmap = pList->GetUiBitmap( i );
- if( !aBitmap.IsEmpty() )
- InsertEntry(pEntry->GetName(), Image(aBitmap));
- else
- InsertEntry( pEntry->GetName() );
- }
-
- AdaptDropDownLineCountToMaximum();
- SetUpdateMode( true );
-}
-
// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XHatchListRef &pList )
@@ -1234,52 +1210,6 @@ VCL_BUILDER_DECL_FACTORY(GradientLB)
rRet = pListBox;
}
-void GradientLB::Fill( const XGradientListRef &pList )
-{
- if( !pList.is() )
- return;
-
- mpList = pList;
- long nCount = pList->Count();
-
- SetUpdateMode( false );
-
- for( long i = 0; i < nCount; i++ )
- {
- const XGradientEntry* pEntry = pList->GetGradient(i);
- const Bitmap aBitmap = pList->GetUiBitmap( i );
- if( !aBitmap.IsEmpty() )
- InsertEntry(pEntry->GetName(), Image(aBitmap));
- else
- InsertEntry( pEntry->GetName() );
- }
-
- AdaptDropDownLineCountToMaximum();
- SetUpdateMode( true );
-}
-
-void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
- const XGradient& rGradient )
-{
- long nCount = pList.get() ? pList->Count() : 0;
- const XGradientEntry* pEntry;
- bool bFound = false;
- OUString aStr;
-
- long i;
- for( i = 0; i < nCount && !bFound; i++ )
- {
- pEntry = pList->GetGradient( i );
-
- aStr = pEntry->GetName();
-
- if( rStr == aStr && rGradient == pEntry->GetGradient() )
- bFound = true;
- }
- if( bFound )
- SelectEntryPos( (sal_uInt16) ( i - 1 ) );
-}
-
// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XGradientListRef &pList )
@@ -1376,31 +1306,6 @@ namespace
}
} // end of anonymous namespace
-void BitmapLB::Fill( const XBitmapListRef &pList )
-{
- if( !pList.is() )
- return;
-
- mpList = pList;
- const XBitmapEntry* pEntry;
- const long nCount(pList->Count());
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- const Size aSize(rStyleSettings.GetListBoxPreviewDefaultPixelSize());
-
- SetUpdateMode(false);
-
- for(long i(0); i < nCount; i++)
- {
- pEntry = pList->GetBitmap(i);
- maBitmapEx = pEntry->GetGraphicObject().GetGraphic().GetBitmapEx();
- formatBitmapExToSize(maBitmapEx, aSize);
- InsertEntry(pEntry->GetName(), Image(maBitmapEx));
- }
-
- AdaptDropDownLineCountToMaximum();
- SetUpdateMode(true);
-}
-
FillAttrLB::FillAttrLB(vcl::Window* pParent, WinBits aWB)
: ColorListBox(pParent, aWB)
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index e4b3a0f..d5db8f9 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -451,48 +451,6 @@ bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
return bRet;
}
-sal_Unicode BulletsTypeMgr::GetBulChar(sal_uInt16 nIndex)
-{
- sal_Unicode cChar;
- //sal_uInt16 nLength = 0;
- //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
-
- if ( nIndex >= DEFAULT_BULLET_TYPES )
- cChar = ' ';
- else
- cChar = pActualBullets[nIndex]->cBulletChar;
-
- /*if( AllSettings::GetLayoutRTL() )
- {
- nLength = sizeof(aDynamicRTLBulletTypes)/sizeof(sal_Unicode);
-
- if ( nIndex >= nLength )
- cChar = ' ';
- else
- cChar = aDynamicRTLBulletTypes[nIndex];
- }else
- {
- nLength = sizeof(aDynamicBulletTypes)/sizeof(sal_Unicode);
-
- if ( nIndex >= nLength )
- cChar = ' ';
- else
- cChar = aDynamicBulletTypes[nIndex];
- }*/
-
- return cChar;
-}
-vcl::Font BulletsTypeMgr::GetBulCharFont(sal_uInt16 nIndex)
-{
- vcl::Font aRet;
- if ( nIndex >= DEFAULT_BULLET_TYPES )
- aRet = lcl_GetDefaultBulletFont();
- else
- aRet = pActualBullets[nIndex]->aFont;
-
- return aRet;
-}
-
// Numbering Type lib
NumberingTypeMgr::NumberingTypeMgr()
: NBOTypeMgrBase()
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index a9b1fc6..1d8f887 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -37,35 +37,6 @@ ValueSetWithTextControl::ValueSetWithTextControl(Window* pParent, WinBits nBits)
SetColCount();
}
-void ValueSetWithTextControl::AddItem(
- const Image& rItemImage,
- const OUString& rItemText,
- const OUString* pItemHelpText )
-{
- if ( meControlType != ControlType::ImageText )
- {
- return;
- }
-
- ValueSetWithTextItem aItem;
- aItem.maItemImage = rItemImage;
- aItem.maSelectedItemImage = rItemImage;
-
- if ( GetDPIScaleFactor() > 1 )
- {
- BitmapEx b = aItem.maItemImage.GetBitmapEx();
- b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
- aItem.maItemImage = Image(b);
- }
-
- aItem.maItemText = rItemText;
-
- maItems.push_back( aItem );
-
- InsertItem( maItems.size() );
- SetItemText( maItems.size(),
- (pItemHelpText != nullptr) ? *pItemHelpText : rItemText );
-}
void ValueSetWithTextControl::AddItem(
const OUString& rItemText,
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 59cadd9..811c8c6 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -682,7 +682,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/sidebar/PageSizePopup \
sw/source/uibase/sidebar/PageColumnControl \
sw/source/uibase/sidebar/PageColumnPopup \
- sw/source/uibase/sidebar/PagePropertyPanel \
sw/source/uibase/sidebar/PageFormatPanel \
sw/source/uibase/sidebar/PageHeaderPanel \
sw/source/uibase/sidebar/PageFooterPanel \
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 4aea45b..3d6a384 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -18,7 +18,6 @@
*/
#include "PageColumnControl.hxx"
-#include "PagePropertyPanel.hxx"
#include <cmdid.h>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index cb16460..e7a1285 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -28,8 +28,6 @@
namespace sw { namespace sidebar {
-class PagePropertyPanel;
-
class PageColumnControl : public SfxPopupWindow
{
public:
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 897ef69..90d7e67 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -22,11 +22,12 @@
#include <cstdlib>
#include "PageMarginControl.hxx"
-#include "PagePropertyPanel.hxx"
#include "PropertyPanel.hrc"
+#include <editeng/sizeitem.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svxids.hrc>
+#include <svx/pageitem.hxx>
#include <svl/itempool.hxx>
#include <svl/intitem.hxx>
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index fd82641..050495d 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -41,8 +41,6 @@ static const long MINBODY = 284; //0.5 cm in twips
namespace sw { namespace sidebar {
-class PagePropertyPanel;
-
class PageMarginControl : public SfxPopupWindow
{
public:
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index cc9c1b3..e05806f 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -30,8 +30,6 @@ class Button;
namespace sw { namespace sidebar {
-class PagePropertyPanel;
-
class PageOrientationControl : public SfxPopupWindow
{
public:
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
deleted file mode 100644
index 7a3db1d..0000000
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <cstdlib>
-
-#include "PagePropertyPanel.hxx"
-
-#include <swtypes.hxx>
-#include <cmdid.h>
-
-#include <svl/intitem.hxx>
-#include <editeng/sizeitem.hxx>
-#include <editeng/paperinf.hxx>
-#include <svx/svxids.hrc>
-#include <svx/dlgutil.hxx>
-#include <svx/rulritem.hxx>
-
-#include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/objsh.hxx>
-
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-
-namespace sw { namespace sidebar {
-
-PagePropertyPanel::PagePropertyPanel(
- vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame>& rxFrame,
- SfxBindings* )
- : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame)
-{
-}
-
-PagePropertyPanel::~PagePropertyPanel()
-{
- disposeOnce();
-}
-
-
-} } // end of namespace ::sw::sidebar
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
deleted file mode 100644
index 450d353..0000000
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/document/XUndoManager.hpp>
-
-#include <svx/sidebar/PanelLayout.hxx>
-
-#include <sfx2/sidebar/ControllerItem.hxx>
-
-#include <i18nutil/paper.hxx>
-
-#include <svx/pageitem.hxx>
-#include <svx/rulritem.hxx>
-#include <editeng/sizeitem.hxx>
-
-#include <vcl/ctrl.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <svl/intitem.hxx>
-
-#include <memory>
-
-namespace sw { namespace sidebar {
-
- class PagePropertyPanel : public PanelLayout
- {
- public:
-
- PagePropertyPanel(
- vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings );
- private:
- virtual ~PagePropertyPanel() override;
- };
-
-} } // end of namespace ::sw::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index cd6acf7..52f3e55 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -18,12 +18,11 @@
*/
#include "PageSizeControl.hxx"
-#include "PagePropertyPanel.hxx"
#include <cmdid.h>
#include <swtypes.hxx>
#include <svx/svxids.hrc>
-
+#include <svx/pageitem.hxx>
#include <svx/sidebar/ValueSetWithTextControl.hxx>
#include <rtl/character.hxx>
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 0d3321a..c5247dd 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -38,8 +38,6 @@ class ValueSet;
namespace sw { namespace sidebar {
-class PagePropertyPanel;
-
class PageSizeControl : public SfxPopupWindow
{
public:
diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.cxx b/ucb/source/ucp/webdav-neon/DAVTypes.cxx
index 5c1844d..02ae439 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.cxx
@@ -171,31 +171,6 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & rDAVOptions, const sal_uInt32
m_aTheCache[ aEncodedUrl ] = rDAVOptions;
}
-sal_uInt16 DAVOptionsCache::getHttpResponseStatusCode( const OUString & rURL, OUString & rHttpResponseStatusText )
-{
- osl::MutexGuard aGuard( m_aMutex );
- OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( NeonUri::unescape( rURL ) ) );
- normalizeURLLastChar( aEncodedUrl );
-
- DAVOptionsMap::iterator it;
- it = m_aTheCache.find( aEncodedUrl );
- if ( it != m_aTheCache.end() )
- {
- // first check for stale
- TimeValue t1;
- osl_getSystemTime( &t1 );
- if( (*it).second.getStaleTime() < t1.Seconds )
- {
- m_aTheCache.erase( it );
- return 0;
- }
-
- rHttpResponseStatusText = (*it).second.getHttpResponseStatusText();
- return (*it).second.getHttpResponseStatusCode();
- }
- return 0;
-}
-
void DAVOptionsCache::setHeadAllowed( const OUString & rURL, const bool HeadAllowed )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -219,32 +194,4 @@ void DAVOptionsCache::setHeadAllowed( const OUString & rURL, const bool HeadAllo
}
}
-bool DAVOptionsCache::isHeadAllowed( const OUString & rURL )
-{
- osl::MutexGuard aGuard( m_aMutex );
- OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( NeonUri::unescape( rURL ) ) );
- normalizeURLLastChar( aEncodedUrl );
-
- DAVOptionsMap::iterator it;
- it = m_aTheCache.find( aEncodedUrl );
- if ( it != m_aTheCache.end() )
- {
- // first check for stale
- TimeValue t1;
- osl_getSystemTime( &t1 );
- if( (*it).second.getStaleTime() < t1.Seconds )
- {
- m_aTheCache.erase( it );
- return true; // to force again OPTIONS method
- }
-
- // check if the resource was present on server
- return (*it).second.isHeadAllowed();
- }
- // this value is needed because some web server don't implement
- // OPTIONS method, so the resource is considered found,
- // until detected otherwise
- return true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
index c7c3715..8474ad9 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
@@ -180,22 +180,6 @@ namespace webdav_ucp
void removeDAVOptions( const OUString & rURL );
void addDAVOptions( DAVOptions & rDAVOptions, const sal_uInt32 nLifeTime );
- /** return the cached value of HTTP response status code
- If the cached value is found stale, it is removed.
-
- @param (in) OUString
- the resource URL
-
- @return int
- the cached
- are not present (meaning the resource should be checked for
- presence anyway)
- false if resource was not found
- */
- sal_uInt16 getHttpResponseStatusCode( const OUString & rURL, OUString & rHttpResponseStatusText );
-
- bool isHeadAllowed( const OUString & rURL );
-
void setHeadAllowed( const OUString & rURL, bool HeadAllowed = true );
private:
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e1336ab..33e6fe8 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1372,11 +1372,6 @@ void Application::EnableAutoHelpId()
ImplGetSVData()->maHelpData.mbAutoHelpId = true;
}
-bool Application::IsAutoHelpIdEnabled()
-{
- return ImplGetSVData()->maHelpData.mbAutoHelpId;
-}
-
OUString Application::GetToolkitName()
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 49ad8ca..40c2954 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -338,12 +338,6 @@ void SpinField::ImplInit(vcl::Window* pParent, WinBits nWinStyle)
}
}
-SpinField::SpinField(WindowType nTyp) :
- Edit(nTyp)
-{
- ImplInitSpinFieldData();
-}
-
SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle) :
Edit(WINDOW_SPINFIELD)
{
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index f5d93da..7042d29 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -310,7 +310,6 @@ public:
void SetPageNumber( sal_Int32 nSet ) { m_nPageNumber = nSet; }
void SetPageNumberType(sal_Int32 nSet) { m_nPageNumberType = nSet; }
void SetBreakType( sal_Int32 nSet ) { m_nBreakType = nSet; }
- sal_Int32 GetBreakType( ) { return m_nBreakType; }
void SetLeftMargin( sal_Int32 nSet ) { m_nLeftMargin = nSet; }
sal_Int32 GetLeftMargin() { return m_nLeftMargin; }
More information about the Libreoffice-commits
mailing list