[Libreoffice-commits] core.git: 2 commits - forms/source scaddins/source sc/source sd/inc sd/source slideshow/source soltools/cpp starmath/inc stoc/source svtools/Library_svt.mk svtools/source svx/source sw/inc sw/Library_sw.mk sw/source
Noel Grandin
noel at peralex.com
Thu Oct 1 23:20:50 PDT 2015
forms/source/component/Button.cxx | 24
forms/source/component/Button.hxx | 72 -
forms/source/component/CheckBox.cxx | 16
forms/source/component/CheckBox.hxx | 17
forms/source/component/Columns.cxx | 2
forms/source/component/Columns.hxx | 64 -
forms/source/component/ComboBox.cxx | 12
forms/source/component/ComboBox.hxx | 58 -
forms/source/component/Currency.cxx | 14
forms/source/component/Currency.hxx | 22
forms/source/component/DatabaseForm.cxx | 70 -
forms/source/component/DatabaseForm.hxx | 488 +++++-----
forms/source/component/Date.cxx | 16
forms/source/component/Date.hxx | 45
forms/source/component/Edit.cxx | 32
forms/source/component/Edit.hxx | 66 -
forms/source/component/EditBase.cxx | 6
forms/source/component/EditBase.hxx | 24
forms/source/component/EventThread.cxx | 2
forms/source/component/EventThread.hxx | 24
forms/source/component/File.cxx | 20
forms/source/component/File.hxx | 32
forms/source/component/Filter.cxx | 12
forms/source/component/Filter.hxx | 124 +-
forms/source/component/FixedText.cxx | 8
forms/source/component/FixedText.hxx | 10
forms/source/component/FormComponent.cxx | 54 -
forms/source/component/FormattedField.cxx | 68 -
forms/source/component/FormattedField.hxx | 84 -
forms/source/component/FormattedFieldWrapper.cxx | 14
forms/source/component/FormattedFieldWrapper.hxx | 32
forms/source/component/FormsCollection.hxx | 70 -
forms/source/component/Grid.cxx | 18
forms/source/component/Grid.hxx | 94 -
forms/source/component/GroupBox.cxx | 12
forms/source/component/GroupBox.hxx | 14
forms/source/component/GroupManager.cxx | 10
forms/source/component/GroupManager.hxx | 60 -
forms/source/component/Hidden.cxx | 10
forms/source/component/Hidden.hxx | 20
forms/source/component/ImageButton.cxx | 20
forms/source/component/ImageButton.hxx | 30
forms/source/component/ImageControl.cxx | 22
forms/source/component/ImageControl.hxx | 84 -
forms/source/component/ListBox.cxx | 16
forms/source/component/ListBox.hxx | 148 +--
forms/source/component/Numeric.cxx | 14
forms/source/component/Numeric.hxx | 22
forms/source/component/Pattern.cxx | 14
forms/source/component/Pattern.hxx | 26
forms/source/component/RadioButton.cxx | 12
forms/source/component/RadioButton.hxx | 30
forms/source/component/Time.cxx | 16
forms/source/component/Time.hxx | 46
forms/source/component/cachedrowset.hxx | 6
forms/source/component/clickableimage.hxx | 106 +-
forms/source/component/entrylisthelper.cxx | 2
forms/source/component/entrylisthelper.hxx | 44
forms/source/component/errorbroadcaster.cxx | 2
forms/source/component/errorbroadcaster.hxx | 10
forms/source/component/findpos.cxx | 2
forms/source/component/findpos.hxx | 2
forms/source/component/imgprod.cxx | 56 -
forms/source/component/imgprod.hxx | 30
forms/source/component/navigationbar.hxx | 56 -
forms/source/component/refvaluecomponent.hxx | 28
forms/source/component/scrollbar.cxx | 6
forms/source/component/scrollbar.hxx | 28
forms/source/component/spinbutton.cxx | 6
forms/source/component/spinbutton.hxx | 28
forms/source/helper/urltransformer.cxx | 2
forms/source/helper/windowstateguard.cxx | 14
forms/source/inc/FormComponent.hxx | 393 ++++----
forms/source/inc/InterfaceContainer.hxx | 180 +--
forms/source/inc/cloneable.hxx | 4
forms/source/inc/commanddescriptionprovider.hxx | 4
forms/source/inc/commandimageprovider.hxx | 6
forms/source/inc/componenttools.hxx | 14
forms/source/inc/controlfeatureinterception.hxx | 22
forms/source/inc/featuredispatcher.hxx | 2
forms/source/inc/formcontrolfont.hxx | 27
forms/source/inc/formnavigation.hxx | 36
forms/source/inc/limitedformats.hxx | 22
forms/source/inc/listenercontainers.hxx | 14
forms/source/inc/property.hrc | 8
forms/source/inc/property.hxx | 28
forms/source/inc/propertybaghelper.hxx | 28
forms/source/inc/resettable.hxx | 4
forms/source/inc/urltransformer.hxx | 12
forms/source/inc/windowstateguard.hxx | 4
forms/source/misc/InterfaceContainer.cxx | 2
forms/source/richtext/attributedispatcher.hxx | 8
forms/source/richtext/clipboarddispatcher.hxx | 4
forms/source/richtext/featuredispatcher.hxx | 22
forms/source/richtext/parametrizedattributedispatcher.hxx | 8
forms/source/richtext/richtextcontrol.cxx | 14
forms/source/richtext/richtextcontrol.hxx | 34
forms/source/richtext/richtextmodel.hxx | 46
forms/source/richtext/richtextvclcontrol.cxx | 2
forms/source/richtext/specialdispatchers.hxx | 22
forms/source/runtime/formoperations.cxx | 6
forms/source/runtime/formoperations.hxx | 102 +-
forms/source/solar/component/navbarcontrol.hxx | 38
forms/source/xforms/NameContainer.hxx | 64 -
forms/source/xforms/binding.cxx | 2
forms/source/xforms/computedexpression.hxx | 6
forms/source/xforms/convert.hxx | 10
forms/source/xforms/datatyperepository.cxx | 22
forms/source/xforms/datatyperepository.hxx | 24
forms/source/xforms/datatypes.cxx | 4
forms/source/xforms/datatypes.hxx | 98 +-
forms/source/xforms/datatypes_impl.hxx | 4
forms/source/xforms/enumeration.hxx | 16
forms/source/xforms/evaluationcontext.hxx | 12
forms/source/xforms/model.cxx | 6
forms/source/xforms/model_helper.hxx | 20
forms/source/xforms/model_ui.cxx | 46
forms/source/xforms/namedcollection.hxx | 14
forms/source/xforms/pathexpression.hxx | 6
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/propertysetbase.hxx | 48
forms/source/xforms/submission.cxx | 14
forms/source/xforms/submission.hxx | 84 -
forms/source/xforms/submission/submission.hxx | 10
forms/source/xforms/unohelper.hxx | 2
forms/source/xforms/xformsevent.hxx | 2
forms/source/xforms/xmlhelper.hxx | 6
forms/source/xforms/xpathlib/extension.cxx | 6
forms/source/xforms/xpathlib/extension.hxx | 14
sc/source/filter/inc/formulaparser.hxx | 12
sc/source/filter/inc/ftools.hxx | 5
sc/source/filter/inc/op.h | 3
sc/source/filter/inc/tool.h | 4
sc/source/filter/inc/xedbdata.hxx | 1
sc/source/filter/inc/xerecord.hxx | 3
sc/source/filter/oox/formulaparser.cxx | 16
sc/source/ui/cctrl/checklistmenu.cxx | 4
sc/source/ui/inc/anyrefdg.hxx | 18
sc/source/ui/inc/checklistmenu.hxx | 1
sc/source/ui/inc/selectionstate.hxx | 1
sc/source/ui/inc/viewdata.hxx | 2
sc/source/ui/vba/vbaformat.cxx | 20
sc/source/ui/vba/vbaformat.hxx | 3
sc/source/ui/vba/vbapagebreak.cxx | 20
sc/source/ui/vba/vbapagebreak.hxx | 4
scaddins/source/analysis/analysishelper.hxx | 2
sd/inc/SdShapeTypes.hxx | 10
sd/source/filter/eppt/epptbase.hxx | 1
sd/source/filter/eppt/epptooxml.hxx | 1
sd/source/filter/eppt/text.hxx | 3
sd/source/filter/ppt/pptanimations.hxx | 1
sd/source/filter/ppt/pptatom.hxx | 7
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/dlg/PhotoAlbumDialog.hxx | 1
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 1
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 11
sd/source/ui/dlg/tpaction.cxx | 1
sd/source/ui/inc/OutlinerIteratorImpl.hxx | 5
sd/source/ui/inc/navigatr.hxx | 2
sd/source/ui/inc/taskpane/PanelId.hxx | 1
sd/source/ui/inc/tpaction.hxx | 3
sd/source/ui/inc/vectdlg.hxx | 1
sd/source/ui/remotecontrol/BluetoothServer.hxx | 2
sd/source/ui/remotecontrol/ZeroconfService.hxx | 4
sd/source/ui/sidebar/LayoutMenu.cxx | 1
sd/source/ui/sidebar/LayoutMenu.hxx | 2
sd/source/ui/sidebar/MasterPagesSelector.hxx | 1
sd/source/ui/sidebar/PanelFactory.hxx | 2
sd/source/ui/slideshow/SlideShowRestarter.hxx | 6
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 1
sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 9
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 8
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 1
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 1
sd/source/ui/unoidl/unocpres.hxx | 1
sd/source/ui/unoidl/unoobj.cxx | 4
sd/source/ui/unoidl/unoobj.hxx | 23
slideshow/source/engine/activities/activitiesfactory.cxx | 7
slideshow/source/engine/color.cxx | 7
slideshow/source/engine/pointersymbol.hxx | 10
slideshow/source/engine/waitsymbol.hxx | 10
slideshow/source/inc/hslcolor.hxx | 1
slideshow/source/inc/tools.hxx | 2
soltools/cpp/cpp.h | 1
starmath/inc/symbol.hxx | 6
starmath/inc/utility.hxx | 8
stoc/source/corereflection/base.hxx | 9
stoc/source/security/lru_cache.h | 18
svtools/Library_svt.mk | 1
svtools/source/dialogs/mcvmath.cxx | 53 -
svtools/source/dialogs/mcvmath.hxx | 196 ----
svx/source/svdraw/svdconv.hxx | 6
sw/Library_sw.mk | 1
sw/inc/doc.hxx | 1
sw/inc/fldbas.hxx | 2
sw/inc/fmtautofmt.hxx | 1
sw/inc/fmtflcnt.hxx | 1
sw/inc/fmtinfmt.hxx | 4
sw/inc/fmtrfmrk.hxx | 1
sw/inc/fmtruby.hxx | 1
sw/inc/mdiexp.hxx | 4
sw/inc/pam.hxx | 2
sw/inc/sw3convert.hxx | 33
sw/inc/swbaslnk.hxx | 1
sw/inc/viewopt.hxx | 3
sw/source/core/doc/docdesc.cxx | 6
sw/source/core/docnode/ndsect.cxx | 30
sw/source/core/inc/cntfrm.hxx | 5
sw/source/core/inc/doctxm.hxx | 1
sw/source/core/inc/frame.hxx | 5
sw/source/core/sw3io/sw3convert.cxx | 280 -----
sw/source/filter/inc/fltshell.hxx | 6
sw/source/filter/ww8/WW8Sttbf.hxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 5
sw/source/filter/ww8/docxattributeoutput.hxx | 1
sw/source/filter/ww8/writerhelper.hxx | 32
sw/source/uibase/docvw/romenu.hxx | 2
sw/source/uibase/inc/cfgitems.hxx | 2
sw/source/uibase/inc/initui.hxx | 2
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/uiview/viewfunc.hxx | 1
221 files changed, 2198 insertions(+), 3240 deletions(-)
New commits:
commit d68a0fc050ea4d57e15246f8e71781cd42ebdaa1
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 1 13:56:48 2015 +0200
loplugin:unusedmethods
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c
Reviewed-on: https://gerrit.libreoffice.org/19072
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx
index 2864aab..9550086 100644
--- a/sc/source/filter/inc/formulaparser.hxx
+++ b/sc/source/filter/inc/formulaparser.hxx
@@ -114,18 +114,6 @@ public:
FormulaType eType,
SequenceInputStream& rStrm ) const;
- /** Imports and converts a BIFF2-BIFF8 token array from the passed stream.
- @param pnFmlaSize Size of the token array. If null is passed, reads
- it from stream (1 byte in BIFF2, 2 bytes otherwise) first. */
- ApiTokenSequence importFormula(
- const ::com::sun::star::table::CellAddress& rBaseAddr,
- FormulaType eType,
- BiffInputStream& rStrm,
- const sal_uInt16* pnFmlaSize = 0 ) const;
-
- /** Converts the passed BIFF error code to a similar formula. */
- ApiTokenSequence convertErrorToFormula( sal_uInt8 nErrorCode ) const;
-
/** Converts the passed XML formula to an OLE link target. */
OUString importOleTargetLink( const OUString& rFormulaString );
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 2a0194a..8200b6e 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -55,11 +55,6 @@ template< typename ReturnType, typename Type >
inline ReturnType llimit_cast( Type nValue, ReturnType nMin )
{ return static_cast< ReturnType >( ::std::max< Type >( nValue, nMin ) ); }
-/** Returns the value, if it fits into ReturnType, otherwise the minimum value of ReturnType. */
-template< typename ReturnType, typename Type >
-inline ReturnType llimit_cast( Type nValue )
-{ return llimit_cast( nValue, ::std::numeric_limits< ReturnType >::min() ); }
-
/** Returns the value, if it is not greater than nMax, otherwise nMax. */
template< typename ReturnType, typename Type >
inline ReturnType ulimit_cast( Type nValue, ReturnType nMax )
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 4e70bcb..156df3c 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.h
@@ -31,10 +31,7 @@ void OP_EOF(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
void OP_Integer(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
void OP_Number(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
void OP_Label(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
-void OP_Integer3(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge ); // WK3
-void OP_Number3(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge ); // WK3
void OP_Formula(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
-void OP_Formula3(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge ); // WK3
void OP_ColumnWidth(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
void OP_NamedRange(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
void OP_SymphNamedRange(LotusContext &rContext, SvStream &aStream, sal_uInt16 nLaenge );
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index f5e632d..88a473c 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -34,11 +34,9 @@ void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB
void SetFormat(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt);
-OUString DosToSystem( sal_Char *pSource );
-
double SnumToDouble( sal_Int16 nVal );
-double Snum32ToDouble( sal_uInt32 nValue );
+double Snum32ToDouble( sal_uInt32 nValue );
typedef sal_uInt16 StampTyp;
diff --git a/sc/source/filter/inc/xedbdata.hxx b/sc/source/filter/inc/xedbdata.hxx
index 022dff5..f5dd980 100644
--- a/sc/source/filter/inc/xedbdata.hxx
+++ b/sc/source/filter/inc/xedbdata.hxx
@@ -59,7 +59,6 @@ public:
virtual ~XclExpTablesManager();
void Initialize();
- bool AppendTable( const ScDBData& rData, sal_Int32 nTableId );
XclExpTables* GetTablesBySheet( SCTAB nTab );
private:
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index df1383d..7bbdd36 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -332,9 +332,6 @@ public:
/** Appends a newly created record to the list. */
inline void AppendNewRecord( RecType* pRec )
{ if( pRec ) AppendRecord( RecordRefType( pRec ) ); }
- /** Replaces the record at the specified position from the list with the passed newly created record. */
- inline void ReplaceNewRecord( RecType* pRec, size_t nPos )
- { RemoveRecord( nPos ); InsertNewRecord( pRec, nPos ); }
/** Removes the record at the specified position from the list. */
inline void RemoveRecord( size_t nPos )
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 4a48cf2..2ace00d 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2797,22 +2797,6 @@ ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress,
return mxImpl->importBiff12Formula( rBaseAddress, eType, rStrm );
}
-ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress, FormulaType eType, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) const
-{
- return mxImpl->importBiffFormula( rBaseAddress, eType, rStrm, pnFmlaSize );
-}
-
-ApiTokenSequence FormulaParser::convertErrorToFormula( sal_uInt8 nErrorCode ) const
-{
- ApiTokenSequence aTokens( 3 );
- // HACK: enclose all error codes into an 1x1 matrix
- aTokens[ 0 ].OpCode = OPCODE_ARRAY_OPEN;
- aTokens[ 1 ].OpCode = OPCODE_PUSH;
- aTokens[ 1 ].Data <<= BiffHelper::calcDoubleFromError( nErrorCode );
- aTokens[ 2 ].OpCode = OPCODE_ARRAY_CLOSE;
- return aTokens;
-}
-
OUString FormulaParser::importOleTargetLink( const OUString& rFormulaString )
{
sal_Int32 nRefId = -1;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 75daa6a..09e608e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1215,10 +1215,6 @@ IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void)
mePrevToggleAllState = maChkToggleAll->GetState();
}
-IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, EdModifyCheckBoxHdl, CheckBox&, void)
-{
- EdModifyHdl(nullptr);
-}
IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl)
{
OUString aSearchText = maEdSearch->GetText();
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index df1f723..6f367a8 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -170,10 +170,6 @@ public:
template< class TWindow, bool bBindRef = true >
class ScRefHdlrImplBase: public TWindow, public ScRefHandler
{
-public:
- virtual bool PreNotify( NotifyEvent& rNEvt );
- virtual void StateChanged( StateChangedType nStateChange );
-
private:
template<class TBindings, class TChildWindow, class TParentWindow, class TResId>
ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
@@ -231,20 +227,6 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent,
template<class TWindow, bool bBindRef >
ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){}
-template<class TWindow, bool bBindRef>
-bool ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt )
-{
- ScRefHandler::preNotify( rNEvt, bBindRef );
- return TWindow::PreNotify( rNEvt );
-}
-
-template<class TWindow, bool bBindRef>
-void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nStateChange )
-{
- TWindow::StateChanged( nStateChange );
- ScRefHandler::stateChanged( nStateChange, bBindRef );
-}
-
template<class TDerived, class TBase, bool bBindRef = true>
struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef >
{
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index d7e5c79..d8b3f44 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -332,7 +332,6 @@ private:
DECL_LINK_TYPED( TriStateHdl, Button*, void );
DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void );
DECL_LINK( EdModifyHdl, void* );
- DECL_LINK_TYPED( EdModifyCheckBoxHdl, CheckBox&, void );
private:
VclPtr<Edit> maEdSearch;
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index 20bb26f..2de2433 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -59,7 +59,6 @@ private:
};
bool operator==( const ScSelectionState& rL, const ScSelectionState& rR );
-inline bool operator!=( const ScSelectionState& rL, const ScSelectionState& rR ) { return !(rL == rR); }
#endif
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 180103a..78c5342 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -47,8 +47,6 @@ enum ScVSplitPos { SC_SPLIT_TOP, SC_SPLIT_BOTTOM };
inline ScHSplitPos WhichH( ScSplitPos ePos );
inline ScVSplitPos WhichV( ScSplitPos ePos );
-inline ScSplitPos Which( ScHSplitPos eHPos );
-inline ScSplitPos Which( ScVSplitPos eVPos );
/** Screen behavior related to cursor movements */
enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUMP };
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 33a0584..14a68b7 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -771,26 +771,6 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException )
}
template< typename Ifc1 >
-OUString
-ScVbaFormat<Ifc1>::getServiceImplName()
-{
- return OUString("ScVbaFormat");
-}
-
-template< typename Ifc1 >
-uno::Sequence< OUString >
-ScVbaFormat<Ifc1>::getServiceNames()
-{
- static uno::Sequence< OUString > aServiceNames;
- if ( aServiceNames.getLength() == 0 )
- {
- aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = "ooo.vba.excel.Format";
- }
- return aServiceNames;
-}
-
-template< typename Ifc1 >
ScCellRangesBase*
ScVbaFormat<Ifc1>::getCellRangesBase() throw ( ::uno::RuntimeException )
{
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 7bf80d1..e06db33 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -89,9 +89,6 @@ public:
virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- // XHelperInterface
- virtual OUString getServiceImplName();
- virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index 04b99bd..2674c40 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -85,26 +85,6 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script::
return new ScVbaRange( ScVbaPageBreak_BASE::getParent(), ScVbaPageBreak_BASE::mxContext, xRange);
}
-template< typename Ifc1 >
-OUString
-ScVbaPageBreak<Ifc1>::getServiceImplName()
-{
- return OUString("ScVbaPageBreak");
-}
-
-template< typename Ifc1 >
-uno::Sequence< OUString >
-ScVbaPageBreak<Ifc1>::getServiceNames()
-{
- static uno::Sequence< OUString > aServiceNames;
- if ( aServiceNames.getLength() == 0 )
- {
- aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = "ooo.vba.excel.PageBreak";
- }
- return aServiceNames;
-}
-
template class ScVbaPageBreak< excel::XHPageBreak >;
/* class ScVbaHPageBreak */
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 31d4b45..e401210 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -48,10 +48,6 @@ public:
virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
-
- // XHelperInterface
- virtual OUString getServiceImplName();
- virtual css::uno::Sequence<OUString> getServiceNames();
};
typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE;
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index c44ca47..4d7bc82 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -91,7 +91,6 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
inline double GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
-inline void AlignDate( sal_uInt16& rDay, sal_uInt16 nMonth, sal_uInt16 nYear );
double BinomialCoefficient( double n, double k );
double GetGcd( double f1, double f2 );
@@ -103,7 +102,6 @@ double Erf( double fX );
double Erfc( double fX );
bool ParseDouble( const sal_Unicode*& rpDoubleAsString, double& rReturn );
OUString GetString( double fNumber, bool bLeadingSign = false, sal_uInt16 nMaxNumOfDigits = 15 );
-inline double Exp10( sal_Int16 nPower ); // 10 ^ nPower
double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index 307a8cf..6fbcc3d 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -51,16 +51,6 @@ enum SdShapeTypes
PRESENTATION_PAGENUMBER
};
-/** Factory method that creates accessibility objects corresponding to the
- type of the given shape.
-*/
-AccessibleShape*
- CreateSdAccessibleShape (const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& rxShape
- );
-
} // end of namespace accessibility
#endif
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 7de9162..03cd717 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -313,7 +313,6 @@ class PPTExStyleSheet
~PPTExStyleSheet();
PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; };
- PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; };
void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
FontCollection& rFontCollection, int nInstance, int nLevel );
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 7a5ab07..db80f21 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -74,7 +74,6 @@ public:
virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
- static sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) { return 0; }
virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; }
virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); }
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index fce5f12..ba77550 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -255,8 +255,7 @@ public:
sal_uInt32 ParagraphCount() const;
sal_uInt32 Count() const;
int GetInstance() const;
- bool HasExtendedBullets();
- void WriteTextSpecInfo( SvStream* pStrm );
+ bool HasExtendedBullets();
};
#endif
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 0d909f8..3e54f6d 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -250,7 +250,6 @@ struct transition
bool mbDirection; // true: default geometric direction
static const transition* find( const OUString& rName );
- static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection );
};
static const transition gTransitions[] =
{
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 3900b02..efbd720 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -36,8 +36,6 @@ public:
/** imports this atom and its child atoms */
static Atom* import( const DffRecordHeader& rRootRecordHeader, SvStream& rStCtrl );
- inline const DffRecordHeader& getHeader() const;
-
/** @return true if at least one atom with the given nRecType is found */
inline bool hasChildAtom( sal_uInt16 nRecType ) const;
@@ -87,11 +85,6 @@ inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType ) const
return findNextChildAtom( nRecType, NULL );
}
-inline const DffRecordHeader& Atom::getHeader() const
-{
- return maRecordHeader;
-}
-
inline const Atom* Atom::findFirstChildAtom() const
{
return mpFirstChild;
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index de129e1..8e6eae1 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -135,8 +135,6 @@ class AnnotationWindow : public FloatingWindow
void ToggleInsMode();
- DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
-
virtual void Deactivate() SAL_OVERRIDE;
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 723f20a..a82f0aa 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -74,7 +74,6 @@ private:
DECL_LINK_TYPED(CreateHdl, Button*, void);
DECL_LINK_TYPED(FileHdl, Button*, void);
- DECL_LINK(TextHdl, void*);
DECL_LINK_TYPED(UpHdl, Button*, void);
DECL_LINK_TYPED(DownHdl, Button*, void);
DECL_LINK_TYPED(RemoveHdl, Button*, void);
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index c4679e6..0d7e632 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -73,7 +73,6 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
m_nActive( 0 ),
m_nTopIndex( 0 ),
m_nActiveHeight( 0 ),
- m_nExtraHeight( 2 ),
m_aPinBox( VclPtr<NumericBox>::Create( this, 0 ) ),
m_aDeauthoriseButton( VclPtr<PushButton>::Create( this ) ),
m_aScrollBar( VclPtr<ScrollBar>::Create( this, WB_VERT ) )
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index efcf9b8..c90a8d7 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -98,7 +98,6 @@ class ClientBox : public Control
long m_nTopIndex;
long m_nStdHeight;
long m_nActiveHeight;
- long m_nExtraHeight;
Size m_aOutputSize;
VclPtr<NumericBox> m_aPinBox;
@@ -129,9 +128,6 @@ class ClientBox : public Control
DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_DLLPRIVATE_LINK_TYPED( DeauthoriseHdl, Button*, void );
- //Index starts with 1.
- //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.
- void checkIndex(sal_Int32 pos) const;
public:
ClientBox( vcl::Window* pParent, WinBits nStyle );
@@ -144,24 +140,17 @@ public:
Size GetOptimalSize() const SAL_OVERRIDE;
bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- const Size GetMinOutputSizePixel() const;
- void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
TClientBoxEntry GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
long GetActiveEntryIndex();
- long GetEntryCount() { return (long) m_vEntries.size(); }
Rectangle GetEntryRect( const long nPos ) const;
long PointToPos( const Point& rPos );
void DoScroll( long nDelta );
void RecalcAll();
- void RemoveUnlocked();
void selectEntry( const long nPos );
long addEntry(std::shared_ptr<ClientInfo> pClientInfo);
void clearEntries();
- void prepareChecking();
- void checkEntries();
-
OUString getPin();
void populateEntries();
};
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 9f11609..88bc150 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -99,7 +99,6 @@ SdActionDlg::SdActionDlg (
SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "InteractionPage",
"modules/simpress/ui/interactionpage.ui", &rInAttrs)
- , rOutAttrs(rInAttrs)
, mpView(NULL)
, mpDoc(NULL)
, bTreeUpdated(false)
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 946bba0..e4fb5c3 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -195,11 +195,6 @@ public:
virtual void Reverse() SAL_OVERRIDE;
protected:
- /** Initialize this iterator with respect to the given location. After
- this call the object looks like newly constructed.
- */
- void Init (IteratorLocation aLocation);
-
/** Set up page pointer and object list iterator for the specified
page.
@param nPageIndex
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index f645e9f..96c7958 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -142,10 +142,8 @@ private:
static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false );
NavDocInfo* GetDocInfo();
- DECL_LINK( GetFocusObjectsHdl, void * );
DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void );
DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void );
- DECL_LINK( ClickPageHdl, void * );
DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool );
DECL_LINK( SelectDocumentHdl, void * );
DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx
index b67f1ee..77dc340 100644
--- a/sd/source/ui/inc/taskpane/PanelId.hxx
+++ b/sd/source/ui/inc/taskpane/PanelId.hxx
@@ -37,7 +37,6 @@ namespace sd { namespace toolpanel
PID_UNKNOWN = 5
};
- PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL );
} } // namespace sd::toolpanel
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 05b504e..aced935 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -69,7 +69,6 @@ private:
VclPtr<PushButton> m_pBtnSearch;
VclPtr<PushButton> m_pBtnSeek;
- const SfxItemSet& rOutAttrs;
const ::sd::View* mpView;
SdDrawDocument* mpDoc;
XColorListRef pColList;
@@ -88,11 +87,9 @@ private:
void OpenFileDialog();
::com::sun::star::presentation::ClickAction GetActualClickAction();
void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA );
- void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE );
void SetEditText( OUString const & rStr );
OUString GetEditText( bool bURL = false );
static sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA );
- sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE );
public:
SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index 944a1b2..c732ed9 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -64,7 +64,6 @@ class SdVectorizeDlg : public ModalDialog
void LoadSettings();
void SaveSettings() const;
void InitPreviewBmp();
- void UpdatePreviewMtf();
static Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize );
Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale );
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index bb24268..2cbd040 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -36,7 +36,9 @@ namespace sd
static void doEnsureDiscoverable();
static void doRestoreDiscoverable();
+#if defined(MACOSX)
void addCommunicator( Communicator* pCommunicator );
+#endif
private:
BluetoothServer( std::vector<Communicator*>* pCommunicators );
virtual ~BluetoothServer();
diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx
index aec8e6e..42381ba 100644
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@@ -40,10 +40,6 @@ namespace sd{
:name(aname), port(aport){}
virtual ~ZeroconfService(){}
- std::string getName() const {return name;}
- void setName(const char * n) {name = n;}
- uint getPort() const {return port;}
-
// Clean up the service when closing
virtual void clear() = 0;
// Bonjour for OSX, Avahi for Linux
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index da045f5..6ec0340 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -129,7 +129,6 @@ LayoutMenu::LayoutMenu (
DropTargetHelper(this),
mrBase(rViewShellBase),
mbUseOwnScrollBar(false),
- mnPreferredColumnCount(3),
mxListener(NULL),
mbSelectionUpdatePending(true),
mbIsMainViewChangePending(false),
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 0969de6..2c41d89 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -129,7 +129,6 @@ private:
/** If we are asked for the preferred window size, then use this
many columns for the calculation.
*/
- const int mnPreferredColumnCount;
css::uno::Reference<css::frame::XStatusListener> mxListener;
bool mbSelectionUpdatePending;
bool mbIsMainViewChangePending;
@@ -189,7 +188,6 @@ private:
/** When clicked then set the current page of the view in the center pane.
*/
DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
- DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void);
DECL_LINK_TYPED(StateChangeHandler, const OUString&, void);
DECL_LINK_TYPED(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void);
DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 8d65e5a..e901e1f 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -193,7 +193,6 @@ private:
*/
DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void);
- DECL_LINK(ContextMenuCallback, CommandEvent*);
DECL_LINK_TYPED(ContainerChangeListener, MasterPageContainerChangeEvent&, void);
DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 53b182a..8ba3464 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -51,10 +51,8 @@ class PanelFactory
public PanelFactoryInterfaceBase
{
public:
- static ::rtl::OUString SAL_CALL getImplementationName();
static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance (
const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory);
- static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames();
explicit PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PanelFactory();
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 240d6ec..46a8563 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -69,12 +69,6 @@ private:
SfxDispatcher* mpDispatcher;
sal_Int32 mnCurrentSlideNumber;
- /** The display count is used to determine whether the number of
- displays has changed and thus whether restarting the slide show is
- really necessary.
- */
- sal_Int32 GetDisplayCount();
-
DECL_LINK_TYPED(EndPresentation, void*, void);
/** Restart the presentation on the slide last shown before the restart
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index c419b9f..9046109 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -324,7 +324,6 @@ SelectionFunction::SelectionFunction (
rRequest),
mrSlideSorter(rSlideSorter),
mrController(mrSlideSorter.GetController()),
- mbDragSelection(false),
maInsertionMarkerBox(),
mbProcessingMouseButtonDown(false),
mnShiftKeySelectionAnchor(-1),
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
index 257aaec..47ce0de 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
@@ -143,15 +143,6 @@ private:
const Size& rPreviewSize,
const std::shared_ptr<Cache>& rpCache);
- /** Return a sorted list of the available caches, both active caches and
- those recently used, for the given document. The sort order is so
- that an exact match of the preview size is at the front. Other
- caches follow with the largest size first.
- */
- BestFittingPageCaches GetBestFittingCaches (
- DocumentKey pDocument,
- const Size& rPreviewSize);
-
/** This method is used internally to initialize a newly created
BitmapCache with already exisiting previews.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 723a356..0ec870c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -80,11 +80,6 @@ public:
*/
void NotifyDragFinished();
- /** Call when drag-and-drop or multi selection is started or stopped in
- order to update permission of mouse over indication.
- */
- void UpdateMouseOverIndicationPermission();
-
class EventDescriptor;
class ModeHandler;
friend class ModeHandler;
@@ -121,7 +116,6 @@ private:
/// The rectangle of the mouse drag selection.
Rectangle maDragSelectionRectangle;
- bool mbDragSelection;
/// Box of the insert marker in model coordinates.
Rectangle maInsertionMarkerBox;
@@ -172,8 +166,6 @@ private:
const bool bIsShiftDown,
const bool bIsControlDown);
- void StopDragAndDrop();
-
void SwitchMode (const std::shared_ptr<ModeHandler>& rpHandler);
};
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 3485956..fbbc804 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -43,7 +43,6 @@ class SlideSorter;
namespace sd { namespace slidesorter { namespace model {
inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; }
-inline sal_uInt16 ToCoreIndex (const sal_Int32 nIndex) { return static_cast<sal_uInt16>(nIndex*2+1); }
/** The model of the slide sorter gives access to the slides that are to be
displayed in the slide sorter view. Via the SetDocumentSlides() method
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 71ea664..4f60263 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -88,7 +88,6 @@ private:
Point maIconOffset;
std::unique_ptr<FramePainter> mpShadowPainter;
- void SetPositionAndSize (const Rectangle& rBoundingBox);
Point PaintRepresentatives (
OutputDevice& rContent,
const Size& rPreviewSize,
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index b2bde6c..ac3d6dd 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -54,7 +54,6 @@ public:
virtual ~SdXCustomPresentation() throw();
// internal
- void Invalidate() { mpSdCustomShow = NULL; }
SdCustomShow* GetSdCustomShow() const throw() { return mpSdCustomShow; }
void SetSdCustomShow( SdCustomShow* pShow ) throw() { mpSdCustomShow = pShow; }
SdXImpressDocument* GetModel() const throw() { return mpModel; }
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 47b97e4..b5381cf 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -281,9 +281,7 @@ SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
mpMap( pModel?
lcl_ImplGetShapePropertyMap(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF )
: lcl_GetEmpty_SdXShapePropertyMap_Impl() ),
- mpModel(pModel),
- mpImplementationId( NULL )
-
+ mpModel(pModel)
{
pShape->setMaster( this );
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 5ec8ae0..ddb45cd 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -54,7 +54,6 @@ private:
throw (std::exception);
bool IsPresObj() const
throw (std::exception);
- void SetPresObj( bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
void SetEmptyPresObj(bool bEmpty)
@@ -65,8 +64,6 @@ private:
OUString GetPlaceholderText() const;
- com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId;
-
public:
SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw();
virtual ~SdXShape() throw();
@@ -108,26 +105,6 @@ public:
// XEventsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-private:
- void setOldEffect( const com::sun::star::uno::Any& aValue );
- void setOldTextEffect( const com::sun::star::uno::Any& aValue );
- void setOldSpeed( const com::sun::star::uno::Any& aValue );
- void setOldDimColor( const com::sun::star::uno::Any& aValue );
- void setOldDimHide( const com::sun::star::uno::Any& aValue );
- void setOldDimPrevious( const com::sun::star::uno::Any& aValue );
- void setOldPresOrder( const com::sun::star::uno::Any& aValue );
- void updateOldSoundEffect( SdAnimationInfo* pInfo );
-
- void getOldEffect( com::sun::star::uno::Any& rValue ) const;
- void getOldTextEffect( com::sun::star::uno::Any& rValue ) const;
- void getOldSpeed( com::sun::star::uno::Any& rValue ) const;
- void getOldSoundFile( com::sun::star::uno::Any& rValue ) const;
- void getOldSoundOn( com::sun::star::uno::Any& rValue ) const;
- void getOldDimColor( com::sun::star::uno::Any& rValue ) const;
- void getOldDimHide( com::sun::star::uno::Any& rValue ) const;
- void getOldDimPrev( com::sun::star::uno::Any& rValue ) const;
- void getOldPresOrder( com::sun::star::uno::Any& rValue ) const;
};
struct SvEventDescription;
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 11b495d..713c2bf 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -586,13 +586,6 @@ public:
(*mpAnim)( getPresentationValue( maValues.back() ) );
}
- /// Disposable:
- virtual void dispose()
- {
- mpAnim.reset();
- BaseType::dispose();
- }
-
private:
ValueVectorType maValues;
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index 9bb40d6..17b1e3c 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -216,13 +216,6 @@ namespace slideshow
rLHS.getLuminance() + rRHS.getLuminance() );
}
- HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS )
- {
- return HSLColor( rLHS.getHue() * rRHS.getHue(),
- rLHS.getSaturation() * rRHS.getSaturation(),
- rLHS.getLuminance() * rRHS.getLuminance() );
- }
-
HSLColor operator*( double nFactor, const HSLColor& rRHS )
{
return HSLColor( nFactor * rRHS.getHue(),
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index 8a7517f..3671109 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -63,16 +63,6 @@ private:
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
- template <typename func_type>
- void for_each_sprite( func_type const & func ) const
- {
- ViewsVecT::const_iterator iPos( maViews.begin() );
- const ViewsVecT::const_iterator iEnd( maViews.end() );
- for ( ; iPos != iEnd; ++iPos )
- if( iPos->second )
- func( iPos->second );
- }
-
typedef ::std::vector<
::std::pair<UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index a98b488..f725c55 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -72,16 +72,6 @@ private:
void setVisible( const bool bVisible );
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
- template <typename func_type>
- void for_each_sprite( func_type const & func ) const
- {
- ViewsVecT::const_iterator iPos( maViews.begin() );
- const ViewsVecT::const_iterator iEnd( maViews.end() );
- for ( ; iPos != iEnd; ++iPos )
- if( iPos->second )
- func( iPos->second );
- }
-
typedef ::std::vector<
::std::pair<UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx
index 5529a1b..c38a8f7 100644
--- a/slideshow/source/inc/hslcolor.hxx
+++ b/slideshow/source/inc/hslcolor.hxx
@@ -82,7 +82,6 @@ namespace slideshow
bool operator==( const HSLColor& rLHS, const HSLColor& rRHS );
bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS );
- HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator*( double nFactor, const HSLColor& rRHS );
/** HSL color linear interpolator.
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index bd6a4ea..cc8a8d3 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -298,6 +298,7 @@ namespace slideshow
/// To work around ternary operator in initializer lists
/// (Solaris compiler problems)
+#ifdef SOLARIS
template <typename T>
inline T const & ternary_op(
const bool cond, T const & arg1, T const & arg2 )
@@ -307,6 +308,7 @@ namespace slideshow
else
return arg2;
}
+#endif
template <typename ValueType>
inline bool getPropertyValue(
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index dcf01e5..7628e43 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -198,7 +198,6 @@ void control(Tokenrow *);
void dodefine(Tokenrow *);
void doadefine(Tokenrow *, int);
void doinclude(Tokenrow *, int, int);
-void doif(Tokenrow *, enum kwtype);
void expand(Tokenrow *, Nlist *, MacroValidatorList *);
void builtin(Tokenrow *, int);
int gatherargs(Tokenrow *, Tokenrow **, int *);
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index da477ff..f5b084c 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -39,12 +39,6 @@
-inline const OUString GetExportSymbolName( const OUString &rUiSymbolName )
-{
- return SmLocalizedSymbolData::GetExportSymbolName( rUiSymbolName );
-}
-
-
inline const OUString GetUiSymbolName( const OUString &rExportSymbolName )
{
return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName );
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 0870e6e..7ba0a1e 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -44,14 +44,6 @@ inline long SmPtsTo100th_mm(long nNumPts)
}
-inline long SmPtsTo100th_mm(const Fraction &rNumPts)
- // as above but with argument 'rNumPts' as 'Fraction'
-{
- Fraction aTmp (254000L, 7227L);
- return aTmp *= rNumPts;
-}
-
-
inline Fraction Sm100th_mmToPts(long nNum100th_mm)
// returns the length (in points) that corresponds to the length
// 'nNum100th_mm' (in 100th of mm).
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index c4f5d36..217b55c 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -69,15 +69,6 @@ inline bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionRef
rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0));
}
-inline typelib_TypeDescription * getTypeByName( const OUString & rName )
-{
- typelib_TypeDescription * pTypeDescr = 0;
- typelib_typedescription_getByName( &pTypeDescr, rName.pData );
- if (! pTypeDescr->bComplete)
- typelib_typedescription_complete( &pTypeDescr );
- return pTypeDescr;
-}
-
typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
OUStringHash > OUString2Field;
typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 197f395..51459af 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -82,10 +82,6 @@ public:
*/
inline void set( t_key const & key, t_val const & val );
- /** Clears the cache, releasing all cached elements and keys.
- */
- inline void clear();
-
/** Sets the number of elements to be cached. This will clear previous entries.
@param cacheSize number of elements to be cached
@@ -240,20 +236,6 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
}
}
-template< typename t_key, typename t_val, typename t_hashKey, typename t_equalKey >
-inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear()
-{
- m_key2element.clear();
- for ( ::std::size_t nPos = m_size; nPos--; )
- {
- m_block[ nPos ].m_key = t_key();
- m_block[ nPos ].m_val = t_val();
- }
-#ifdef __CACHE_DIAGNOSE
- OSL_TRACE( "> cleared cache" );
-#endif
-}
-
}
#endif
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index b877d46..9e30e77 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/dialogs/addresstemplate \
svtools/source/dialogs/colrdlg \
svtools/source/dialogs/insdlg \
- svtools/source/dialogs/mcvmath \
svtools/source/dialogs/PlaceEditDialog \
svtools/source/dialogs/prnsetup \
svtools/source/dialogs/restartdialog \
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
deleted file mode 100644
index b4a72eb..0000000
--- a/svtools/source/dialogs/mcvmath.cxx
+++ /dev/null
@@ -1,53 +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 "mcvmath.hxx"
-
-/**************************************************************************
-|*
-|* ImpSqrt()
-|*
-|* Description SquareRoot function for FixPoint-calculations
-|*
-**************************************************************************/
-
-sal_uInt16 ImpSqrt( sal_uLong nRadi )
-{
- sal_uLong inf = 1;
- sal_uLong sup = nRadi;
- sal_uLong sqr;
-
- if ( !nRadi )
- return 0;
-
- while ( (inf<<1) <= sup )
- {
- sup >>= 1;
- inf <<= 1;
- }
- sqr = (sup+inf) >> 1; // startvalue for iteration
-
- sqr = (nRadi/sqr + sqr) >> 1; // 2 Newton-Iterations suffice for
- sqr = (nRadi/sqr + sqr) >> 1; // +- 1 Digit
-
- return sal::static_int_cast< sal_uInt16 >(sqr);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx
deleted file mode 100644
index 2e84f51..0000000
--- a/svtools/source/dialogs/mcvmath.hxx
+++ /dev/null
@@ -1,196 +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_SVTOOLS_SOURCE_DIALOGS_MCVMATH_HXX
-#define INCLUDED_SVTOOLS_SOURCE_DIALOGS_MCVMATH_HXX
-
-#include <tools/solar.h>
-
-class FixCpx;
-
-// No of fractal bits
-// allowed range 0..14, must be even
-#define FIX_POST 14
-
-// scale for ...Big() -Functions
-#if (FIX_POST>=4)
-#define FIX_P2 4
-#define FIX_P3 (FIX_POST-FIX_P2)
-#else
-#define FIX_P2 0
-#define FIX_P3 FIX_POST
-#endif
-
-#if (FIX_POST>=1)
-#define FIX_ADD (1<<(FIX_POST-1))
-#else
-#define FIX_ADD 0
-#endif
-
-#if (FIX_P2>=1)
-#define FIX_A2 (1<<(FIX_P2-1))
-#else
-#define FIX_A2 0
-#endif
-
-#if (FIX_P3>=1)
-#define FIX_A3 (1<<(FIX_P3-1))
-#else
-#define FIX_A3 0
-#endif
-
-
-// - Fix -
-
-
-class Fix
-{
-private:
- friend class FixCpx;
-
-public:
- long x;
-
-public:
- Fix() { x=0; }
- explicit Fix( int i ) { x=(long(i)<<FIX_POST); }
- explicit Fix( short l ) { x=(long(l)<<FIX_POST); }
- explicit Fix( sal_uInt16 l ) { x=(long(l)<<FIX_POST); }
- explicit Fix( long l ) { x=(l<<FIX_POST); }
- Fix( long Z, long N ) { x=(Z<<FIX_POST)/N; }
-
- enum class Bits { Bits };
-
- Fix(long bits, Bits): x(bits) {}
-
- void operator+= ( const Fix& a ) { x+=a.x; }
- void operator-= ( const Fix& a ) { x-=a.x; }
- void operator*= ( const Fix& a ) { x=(x*a.x+FIX_ADD)>>FIX_POST; }
- void operator/= ( const Fix& a ) { x=(x<<FIX_POST)/a.x; }
- friend Fix operator- ( const Fix& a );
-
- friend bool operator> ( const Fix& a, const Fix& b ) { return a.x > b.x; }
- friend bool operator< ( const Fix& a, const Fix& b ) { return a.x < b.x; }
-
- operator long() const { return (x+FIX_ADD) >> FIX_POST; }
- operator double() const { return double(x)/(1<<FIX_POST); }
-
- friend Fix operator+ ( const Fix& a, const Fix& b );
- friend Fix operator- ( const Fix& a, const Fix& b );
- friend Fix operator* ( const Fix& a, const Fix& b );
- friend Fix operator/ ( const Fix& a, const Fix& b );
-
- friend FixCpx operator-( const FixCpx& a );
-};
-
-
-// - FixCpx -
-
-
-class FixCpx
-{
-public:
- Fix r;
- Fix i;
-
-public:
- FixCpx() : r(), i() {}
- explicit FixCpx( Fix a ) : r( a ), i() {}
- FixCpx( Fix a, Fix b ) : r( a ), i( b ) {}
-
- void operator*= ( const FixCpx& ra );
-
- friend FixCpx operator+ ( const FixCpx& a, const FixCpx& b );
- friend FixCpx operator- ( const FixCpx& a, const FixCpx& b );
- friend FixCpx operator* ( const FixCpx& a, const FixCpx& b );
- friend FixCpx operator/ ( const FixCpx& a, const FixCpx& b );
- friend FixCpx operator- ( const FixCpx& a );
-};
-
-inline Fix operator- ( const Fix& a )
-{
- Fix f;
- f.x = -a.x;
- return f;
-}
-
-inline Fix operator+ ( const Fix& a, const Fix& b )
-{
- return Fix(a.x+b.x, Fix::Bits::Bits);
-}
-
-inline Fix operator- ( const Fix& a, const Fix& b )
-{
- return Fix(a.x-b.x, Fix::Bits::Bits);
-}
-
-inline Fix operator* ( const Fix& a, const Fix& b )
-{
- return Fix((a.x*b.x+FIX_ADD)>>FIX_POST, Fix::Bits::Bits);
-}
-
-inline Fix operator/ ( const Fix& a, const Fix& b )
-{
- return Fix((a.x<<FIX_POST)/b.x, Fix::Bits::Bits);
-}
-
-inline FixCpx operator- ( const FixCpx& a )
-{
- FixCpx fc;
-
- fc.r.x = -a.r.x;
- fc.i.x = -a.i.x;
- return fc;
-}
-
-inline FixCpx operator+ ( const FixCpx& a, const FixCpx& b )
-{
- return FixCpx( a.r+b.r, a.i+b.i );
-}
-
-inline FixCpx operator- ( const FixCpx& a, const FixCpx& b )
-{
- return FixCpx( a.r-b.r, a.i-b.i );
-}
-
-inline void FixCpx::operator*= ( const FixCpx& ra )
-{
- Fix rr = ra.r*r-ra.i*i;
- i = ra.r*i+ra.i*r;
- r = rr;
-}
-
-inline FixCpx operator* ( const FixCpx& a, const FixCpx& b )
-{
- return FixCpx( a.r*b.r-a.i*b.i, a.r*b.i+a.i*b.r );
-}
-
-inline FixCpx operator/ ( const FixCpx& a, const FixCpx& b )
-{
- return FixCpx( (a.r*b.r+a.i*b.i)/(b.r*b.r+b.i*b.i),
- (b.r*a.r-a.r*b.i)/(b.r*b.r+b.i*b.i) );
-}
-
-
-
-sal_uInt16 ImpSqrt( sal_uLong nRadi );
-
-#endif // INCLUDED_SVTOOLS_SOURCE_DIALOGS_MCVMATH_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdconv.hxx b/svx/source/svdraw/svdconv.hxx
index dc8fbac..b6ec765 100644
--- a/svx/source/svdraw/svdconv.hxx
+++ b/svx/source/svdraw/svdconv.hxx
@@ -16,17 +16,11 @@ template<typename T> inline T ImplMMToTwips(T val);
template<>
inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
template<>
-inline sal_Int32 ImplMMToTwips(sal_Int32 nVal) { return ((nVal * 72 + 63) / 127); }
-template<>
inline sal_Int64 ImplMMToTwips(sal_Int64 nVal) { return ((nVal * 72 + 63) / 127); }
template<typename T> inline T ImplTwipsToMM(T val);
template<>
inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
-template<>
-inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72); }
-template<>
-inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); }
#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1654395..3ca33e8 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -345,7 +345,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/objectpositioning/tolayoutanchoredobjectposition \
sw/source/core/ole/ndole \
sw/source/core/para/paratr \
- sw/source/core/sw3io/sw3convert \
sw/source/core/sw3io/swacorr \
sw/source/core/swg/SwXMLBlockExport \
sw/source/core/swg/SwXMLBlockImport \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f338348..0b25e5f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -922,7 +922,6 @@ public:
size_t GetPageDescCnt() const { return m_PageDescs.size(); }
const SwPageDesc& GetPageDesc(const size_t i) const { return *m_PageDescs[i]; }
SwPageDesc& GetPageDesc(size_t const i) { return *m_PageDescs[i]; }
- SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = NULL);
SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = NULL) const;
// Just searches the pointer in the m_PageDescs vector!
bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 6406fae..ea30632 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -224,8 +224,6 @@ enum SwDateTimeSubType
};
/// General tools.
-OUString GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM);
-void SetErrorStr(const OUString& rStr);
OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
/** Instances of SwFields and those derived from it occur 0 to n times.
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 14a103c..092d6b0 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -56,7 +56,6 @@ public:
void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
- std::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 83cab4b..bcf3c47 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -47,7 +47,6 @@ public:
inline void SetFlyFormat( SwFrameFormat* pNew = 0 ) { pFormat = pNew; }
const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
- SwTextFlyCnt *GetTextFlyCnt() { return pTextAttr; }
};
#endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index cfe3c79..5703c95 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -68,10 +68,6 @@ public:
{
return mpTextAttr;
}
- SwTextINetFormat* GetTextINetFormat()
- {
- return mpTextAttr;
- }
const OUString& GetValue() const
{
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 8e054f6..3723d74 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -61,7 +61,6 @@ public:
void InvalidateRefMark();
const SwTextRefMark *GetTextRefMark() const { return pTextAttr; }
- SwTextRefMark *GetTextRefMark() { return pTextAttr; }
inline OUString &GetRefName() { return aRefName; }
inline const OUString &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 6e4b6e7..b4dcad3 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -57,7 +57,6 @@ public:
sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwTextRuby* GetTextRuby() const { return pTextAttr; }
- SwTextRuby* GetTextRuby() { return pTextAttr; }
OUString GetText() const { return sRubyText; }
void SetText( const OUString& rText ) { sRubyText = rText; }
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 1e21326..d8a5e0f 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -49,8 +49,6 @@ SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell );
void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell );
void RescheduleProgress( SwDocShell *pDocShell );
-void EnableCmdInterface(bool bEnable = true);
-
void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
// Read ChgMode for tables from configuration.
@@ -58,8 +56,6 @@ TableChgMode GetTableChgDefaultMode();
bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
-extern void AccessibilityScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY, bool isLeftTop);
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index cce42c0..5c9077e 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -154,8 +154,6 @@ extern SwGoInDoc fnGoContentCells;
extern SwGoInDoc fnGoContentSkipHidden;
extern SwGoInDoc fnGoContentCellsSkipHidden;
-void _InitPam();
-
class SwPaM;
/// PaM is Point and Mark: a selection of the document model.
class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM>
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
deleted file mode 100644
index 1c500f0..0000000
--- a/sw/inc/sw3convert.hxx
+++ /dev/null
@@ -1,33 +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_INC_SW3CONVERT_HXX
-#define INCLUDED_SW_INC_SW3CONVERT_HXX
-
-#include <sal/config.h>
-
-class SwDoc;
-
-SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFormat,
- sal_uInt16 nVersion );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index f8c4a54..1df801f 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -24,7 +24,6 @@
class SwNode;
class SwContentNode;
class ReReadThread;
-long GrfNodeChanged( void* pLink, void* pCaller );
class SwBaseLink : public ::sfx2::SvBaseLink
{
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index a2e9d44..924d177 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -101,9 +101,6 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_SECTION_BOUNDARIES 0x0080
#define VIEWOPT_SHADOW 0x0100
-// Implementation in core/text/txtpaint.cxx.
-extern void SyncVout( const OutputDevice *pOut );
-
class SW_DLLPUBLIC SwViewOption
{
static Color aDocColor; // color of document boundaries
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1463650..747ff3d 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -831,12 +831,6 @@ static SwPageDesc* lcl_FindPageDesc( SwPageDescs *pPageDescs,
return res;
}
-SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, size_t* pPos )
-{
- return lcl_FindPageDesc<CompareSwPageDescName>(
- &m_PageDescs, pPos, CompareSwPageDescName(rName) );
-}
-
SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, size_t* pPos ) const
{
return lcl_FindPageDesc<CompareSwPageDescName>(
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index e4a760e..85b6feb 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1000,36 +1000,6 @@ SwSectionNode::SwSectionNode(SwNodeIndex const& rIdx,
rFormat.UnlockModify();
}
-#ifdef DBG_UTIL
-//remove superfluous SectionFrms
-SwFrm* SwClearDummies( SwFrm* pFrm )
-{
- SwFrm* pTmp = pFrm;
- while( pTmp )
- {
- OSL_ENSURE( !pTmp->GetUpper(), "SwClearDummies: No Upper allowed!" );
- if( pTmp->IsSctFrm() )
- {
- SwSectionFrm* pSectFrm = static_cast<SwSectionFrm*>(pFrm);
- pTmp = pTmp->GetNext();
- if( !pSectFrm->GetLower() )
- {
- if( pSectFrm->GetPrev() )
- pSectFrm->GetPrev()->mpNext = pTmp;
- else
- pFrm = pTmp;
- if( pTmp )
- pTmp->mpPrev = pSectFrm->GetPrev();
- SwFrm::DestroyFrm(pSectFrm);
- }
- }
- else
- pTmp = pTmp->GetNext();
- }
- return pFrm;
-}
-#endif
-
SwSectionNode::~SwSectionNode()
{
// mba: test if iteration works as clients will be removed in callback
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 6442a94..76b3544 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -78,7 +78,6 @@ public:
inline const SwContentFrm *GetFollow() const;
inline SwContentFrm *GetFollow();
inline const SwContentFrm *GetPrecede() const;
- inline SwContentFrm *GetPrecede();
SwTextFrm* FindMaster() const;
// layout dependent cursor travelling
@@ -140,10 +139,6 @@ inline const SwContentFrm *SwContentFrm::GetPrecede() const
{
return static_cast<const SwContentFrm*>(SwFlowFrm::GetPrecede());
}
-inline SwContentFrm *SwContentFrm::GetPrecede()
-{
- return static_cast<SwContentFrm*>(SwFlowFrm::GetPrecede());
-}
#endif
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 7689e2a..2a0aa97 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -79,7 +79,6 @@ public:
void UpdatePageNum(); // insert page numbering
TYPEINFO_OVERRIDE(); // for rtti
- SwTOXSortTabBases& GetTOXSortTabBases() { return aSortArr; }
const SwTOXSortTabBases& GetTOXSortTabBases() const { return aSortArr; }
bool SetPosAtStartEnd( SwPosition& rPos, bool bAtStart = true ) const;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index bdfb9a6..714ba6e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -224,11 +224,6 @@ class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster
friend SwFrm *SaveContent( SwLayoutFrm *, SwFrm* pStart );
friend void RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
-#ifdef DBG_UTIL
- // remove empty SwSectionFrms from a chain
- friend SwFrm* SwClearDummies( SwFrm* pFrm );
-#endif
-
// for validating a mistakenly invalidated one in SwContentFrm::MakeAll
friend void ValidateSz( SwFrm *pFrm );
// implemented in text/txtftn.cxx, prevents Footnote oscillation
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
deleted file mode 100644
index cb50b20..0000000
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ /dev/null
@@ -1,280 +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 "hintids.hxx"
-#include "sw3convert.hxx"
-#include <tools/resid.hxx>
-#include <svl/macitem.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
-#include <svl/urihelper.hxx>
-#include <sfx2/linkmgr.hxx>
-
-#include <editeng/lrspitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtfld.hxx>
-#include <frmatr.hxx>
-#include "doc.hxx"
-#include "docary.hxx"
-#include "fldbas.hxx"
-#include "flddat.hxx"
-#include "docufld.hxx"
-#include "chpfld.hxx"
-#include "ddefld.hxx"
-#include "expfld.hxx"
-#include "reffld.hxx"
-#include "usrfld.hxx"
-#include "dbfld.hxx"
-#include "txtfld.hxx"
-#include "ndtxt.hxx"
-
-//really used ids from old sw3ids.hxx
-#define SWG_INETBROWSER 0x000e // URL graph nodes, browse flag, formatter
-#define SWG_NEWFIELDS 0x0200 // Fields with Numberformatter numberformat
-
-using namespace nsSwDocInfoSubType;
-
-struct OldFormats
-{
- NfIndexTableOffset eFormatIdx;
- sal_uInt16 nOldFormat;
-};
-
-static const OldFormats aOldDateFormat40[] =
-{
- // Date fields
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Long system date
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Oct 64
- { NF_DATE_SYS_DMMMYYYY, DFF_DMMYY }, // 06. Oct 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY }, // 06. October 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY }, // 06. October 64
- { NF_DATE_SYS_NNDMMMYY, DFF_DDMMY }, // Tue, 06. Oct 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY }, // Tue, 06. October 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY }, // Tue, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY }, // Tuesday, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY }, // Tuesday, 06. October 64
- { NF_DATE_SYS_MMYY, DFF_MY }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldDateFormat30[] =
-{
- // Date fields
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Long system date
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Oct 64
- { NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/ }, // 06. Oct 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/ }, // 06. October 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/ }, // 06. October 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/ },// Tue, 06. October 1964
- { NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/ }, // Tue, 06. Oct 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/ }, // Tue, 06. October 64
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/ }, // Tuesday, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/ }, // Tuesday, 06. October 64
- { NF_DATE_SYS_MMYY, 2 /*DFF_MY*/ }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldTimeFormat[] =
-{
- // Time fields
- { NF_TIME_HHMMSS, TF_SYSTEM }, // System time
- { NF_TIME_HHMM, TF_SSMM_24 }, // 23:25
- { NF_TIME_HHMMAMPM, TF_SSMM_12 }, // 11:25 PM
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldGetSetExpFormat40[] =
-{
- { NF_TEXT, VVF_CMD }, // Show command
- { NF_TEXT, VVF_INVISIBLE },// Invisible
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
-
- { NF_NUMBER_SYSTEM, VVF_SYS }, // Number format from system preferences
- { NF_NUMBER_INT, VVF_X }, // 1234
- { NF_NUMBER_DEC2, VVF_X_X }, // 1234,5
- { NF_NUMBER_DEC2, VVF_X_XX }, // 1245,56
- { NF_NUMBER_1000DEC2, VVF_XX_XX }, // 1.234,56
- { NF_NUMBER_1000DEC2, VVF_XX_X }, // 1.234,5
- { NF_NUMBER_1000DEC2, VVF_XX_XXX }, // 1.234,567
- { NF_CURRENCY_1000DEC2, VVF_SYS_CUR }, // Currency format from system settings
- // (1.234,00 EUR)
- { NF_CURRENCY_1000INT, VVF_X_CUR }, // 1234 EUR
- { NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR },// 1234,56 EUR 1234,00 EUR
- { NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR },// 1234,56 EUR 1234,-- EUR
- { NF_CURRENCY_1000INT, VVF_CUR_X }, // EUR 1234
- { NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX },// EUR 1234,56 EUR 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0 },// EUR 1234,56 EUR 1234,--
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldGetSetExpFormat30[] =
-{
- { NF_TEXT, VVF_CMD }, // Show command
- { NF_TEXT, VVF_INVISIBLE },// Invisible
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
-
- { NF_NUMBER_SYSTEM, 0x0020 }, // Number format from system preferences
- { NF_NUMBER_INT, 0x0080 }, // 1234
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,56
- { NF_NUMBER_DEC2, 0x0100 }, // 1234,5
- { NF_NUMBER_DEC2, 0x0100 }, // 1245,56
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,5
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,567
- { NF_CURRENCY_1000DEC2, 0x0200 }, // Currency format from system settings
- // (1.234,00 EUR)
- { NF_CURRENCY_1000INT, 0x1000 }, // 1234 EUR
- { NF_CURRENCY_1000DEC2, 0x1000 }, // 1234,56 EUR 1234,00 EUR
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // 1234,56 EUR 1234,-- EUR
- { NF_CURRENCY_1000INT, 0x1000 }, // EUR 1234
- { NF_CURRENCY_1000DEC2, 0x1000 }, // EUR 1234,56 EUR 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // EUR 1234,56 EUR 1234,--
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFormat,
- sal_uInt16 nVersion )
-{
- const OldFormats *pOldFormat = 0L;
-
- switch( rWhich )
- {
- case RES_DATEFLD:
- case RES_FIXDATEFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = DATEFLD;
- if( RES_FIXDATEFLD == rWhich )
- rSubType |= FIXEDFLD;
- rWhich = RES_DATETIMEFLD;
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldDateFormat30
- : aOldDateFormat40;
- }
- break;
-
- case RES_TIMEFLD:
- case RES_FIXTIMEFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = TIMEFLD;
- if( RES_FIXTIMEFLD == rWhich )
- rSubType |= FIXEDFLD;
- rWhich = RES_DATETIMEFLD;
- pOldFormat = aOldTimeFormat;
- }
- break;
-
- case RES_DBFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = nsSwExtendedSubType::SUB_OWN_FMT;
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
- : aOldGetSetExpFormat40;
- }
- break;
-
- case RES_TABLEFLD:
- case RES_GETEXPFLD:
- case RES_SETEXPFLD:
- case RES_USERFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- if( rFormat == VVF_INVISIBLE )
- {
- rSubType = nsSwExtendedSubType::SUB_INVISIBLE;
- rFormat = 0;
- }
- else if( rFormat == VVF_CMD )
- {
- rSubType = nsSwExtendedSubType::SUB_CMD;
- rFormat = 0;
- }
- else
- {
- // Small hack: We still need the unconverted format
- // when handling number groups. We keep it temporarily
- // in the subtype; if it's a valid format in the first
- // place.
- if( RES_SETEXPFLD==rWhich &&
- /*rFormat >= (sal_uInt16)SVX_NUM_CHARS_UPPER_LETTER && always true*/
- rFormat <= (sal_uInt16)SVX_NUM_BITMAP )
- {
- rSubType = (sal_uInt16)rFormat;
- }
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
- : aOldGetSetExpFormat40;
- }
- }
- break;
- case RES_DOCINFOFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- switch( rFormat )
- {
- case RF_AUTHOR: rSubType = DI_SUB_AUTHOR; break;
- case RF_TIME: rSubType = DI_SUB_TIME; break;
- case RF_DATE: rSubType = DI_SUB_DATE; break;
- case RF_ALL: rSubType = DI_SUB_DATE; break;
- }
- rFormat = 0;
- }
- break;
- }
-
- if( pOldFormat )
- {
- SvNumberFormatter *pFormatter = rDoc.GetNumberFormatter();
- sal_uInt16 i = 0;
-
- while( pOldFormat[i].eFormatIdx != NF_NUMERIC_START ||
- pOldFormat[i].nOldFormat)
- {
- if( rFormat == pOldFormat[i].nOldFormat )
- {
- rFormat = pFormatter->GetFormatIndex(pOldFormat[i].eFormatIdx, LANGUAGE_SYSTEM);
- break;
- }
- i++;
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 92235d9..4720707 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -45,12 +45,6 @@ class SwTableBox;
class SwDoc;
class SwPaM;
-inline void SwFltClearFlag(sal_uLong& rFieldFlags, int no)
- { rFieldFlags &= ~(1L << no); }
-
-inline void SwFltSetFlag(sal_uLong& rFieldFlags, int no)
- { rFieldFlags |= sal_uLong(1) << no; }
-
inline bool SwFltGetFlag(sal_uLong nFieldFlags, int no)
{ return (nFieldFlags & (sal_uLong(1) << no)) != 0; }
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 1fc1efa..9e05bae 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -65,12 +65,6 @@ typedef ::std::vector<OUString> StringVector_t;
WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize);
virtual ~WW8Sttb();
- sal_uInt32 getCount() const;
- OUString getEntry(sal_uInt32 nEntry) const
- {
- return m_Strings[nEntry];
- }
-
StringVector_t & getStrings()
{
return m_Strings;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9aa2c0c..2243e3d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8540,11 +8540,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz
m_pSerializer->endElementNS(XML_w, XML_numPicBullet);
}
-void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue )
-{
- AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
-}
-
void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrs, ... )
{
if( !pAttrList )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 132f02f..1878560 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -714,7 +714,6 @@ private:
void CmdField_Impl( FieldInfos& rInfos );
void EndField_Impl( FieldInfos& rInfos );
- static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index df39882..d10f8e3 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -462,38 +462,6 @@ namespace sw
return item_cast<T>(rSet.GetItem(eType));
}
- /** Return a pointer to a SfxPoolItem derived class if it exists in an
- SwFormat
-
- Writer's attributes are retrieved by passing a numeric identifier
- and receiving a SfxPoolItem reference which must then typically be
- cast back to its original type which is both tedious and verbose.
-
- HasItem returns a pointer to the requested SfxPoolItem for a given
- property id if it exists in the SwFormat e.g. fontsize
-
- HasItem uses item_cast () on the retrieved pointer to test that the
- retrieved property is of the type that the developer thinks it is.
-
- @param rSet
- The SwFormat whose property we want
-
- @param eType
- The numeric identifier of the default property to be retrieved
-
- @tplparam T
- A SfxPoolItem derived class of the retrieved property
-
- @return The T requested or 0 if no T found with id eType
-
- @author
- <a href="mailto:cmc at openoffice.org">Caolán McNamara</a>
- */
- template<class T> const T* HasItem(const SwFormat &rFormat,
- sal_uInt16 eType)
- {
- return HasItem<T>(rFormat.GetAttrSet(), eType);
- }
/** Get the Paragraph Styles of a SwDoc
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index a595f63..07241c8 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -57,8 +57,6 @@ public:
void Execute( vcl::Window* pWin, sal_uInt16 nId );
};
-void GetPreferredExtension( OUString &rExt, const Graphic &rGrf );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index d25e2c8..efa8758 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -37,8 +37,6 @@ class SwViewOption;
class SwContentOptPage;
class SwShdwCrsrOptionsTabPage;
-void SetPrt( SfxPrinter* );
-
// OS 12.01.95
// Item for settings dialog - document view
class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index 462fdd5..1cf7a3e 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.hxx
@@ -58,8 +58,6 @@ SwGlossaryList* GetGlossaryList();
extern void _InitUI();
extern void _FinitUI();
-extern void _InitSpell();
-extern void _FinitSpell();
#endif
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 851e088..c24fa27 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -235,8 +235,6 @@ private:
static void InitInterface_Impl();
public:
- inline vcl::Window& GetFrameWindow() const
- { return GetViewFrame()->GetWindow(); }
inline SwViewShell* GetViewShell() const
{ return pViewWin->GetViewShell(); }
inline void RepaintCoreRect( const SwRect& rRect )
diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx
index 9bf8b37..a64bd36 100644
--- a/sw/source/uibase/uiview/viewfunc.hxx
+++ b/sw/source/uibase/uiview/viewfunc.hxx
@@ -33,7 +33,6 @@ namespace vcl { class Window; }
// The following functions are available in viewprt.cxx
void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb );
-VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window*, const SfxItemSet& );
void SetAppPrintOptions( SwViewShell* pSh, bool bWeb );
// The following functions are available in viewport.cxx
commit de020fc9c3c67541067bc7e0b72ed41eae650288
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 1 15:32:00 2015 +0200
com::sun::star->css in forms/
Change-Id: I1c09e88f839bdf11c6ff809ec95769e8f729c7cd
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 62fd0b6..a4c88e2 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -126,13 +126,13 @@ css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() throw(std
}
-OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+OUString OButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
{
return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
}
-void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
+void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception)
{
OClickableImageBaseModel::write(_rxOutStream);
@@ -153,7 +153,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr
}
-void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
+void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception)
{
OClickableImageBaseModel::read(_rxInStream);
@@ -412,7 +412,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
// ActionListener
-void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
+void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css::uno::RuntimeException, std::exception)
{
// Asynchronous for css::util::URL-Button
ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) );
@@ -472,12 +472,12 @@ IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void)
}
}
else
- actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() );
+ actionPerformed_Impl( false, css::awt::MouseEvent() );
}
}
-void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt )
+void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const css::awt::MouseEvent& _rEvt )
{
{
sal_Int16 nFeatureId = -1;
@@ -748,16 +748,16 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc
} // namespace frm
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_form_OButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_form_OButtonModel_get_implementation(css::uno::XComponentContext* component,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OButtonModel(component));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_form_OButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_form_OButtonControl_get_implementation(css::uno::XComponentContext* component,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new frm::OButtonControl(component));
}
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index c6a3139..1e6c43e 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -40,7 +40,7 @@ struct ImplSVEvent;
namespace frm
{
-typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XReset
+typedef ::cppu::ImplHelper1 < css::form::XReset
> OButtonModel_Base;
class OButtonModel :public OClickableImageBaseModel
,public OButtonModel_Base
@@ -50,40 +50,40 @@ public:
// UNO
DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel )
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
+ css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
-// ::com::sun::star::lang::XServiceInfo
+// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OButtonModel"); }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
-// ::com::sun::star::io::XPersistObject
- virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+// css::io::XPersistObject
+ virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XReset
- virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OControlModel's property handling
virtual void describeFixedProperties(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps
+ css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps
) const SAL_OVERRIDE;
// XPropertySet and friends
- virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
+ throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
- ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue )
- throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE;
+ css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
+ throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
+ virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE;
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -109,9 +109,9 @@ protected:
// OButtonControl
-typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XButton
- , ::com::sun::star::awt::XActionListener
- , ::com::sun::star::beans::XPropertyChangeListener
+typedef ::cppu::ImplHelper3 < css::awt::XButton
+ , css::awt::XActionListener
+ , css::beans::XPropertyChangeListener
> OButtonControl_BASE;
class OButtonControl :public OButtonControl_BASE
@@ -127,10 +127,10 @@ private:
protected:
// UNO binding
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE;
public:
- OButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
+ OButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
virtual ~OButtonControl();
// XServiceInfo
@@ -142,29 +142,29 @@ public:
// UNO binding
DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl)
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XActionListener
- virtual void SAL_CALL actionPerformed(const ::com::sun::star::awt::ActionEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XButton
- virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XControl
- virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
// OFormNavigationHelper overriables
@@ -174,11 +174,11 @@ protected:
virtual bool isEnabled( sal_Int16 _nFeatureId ) const SAL_OVERRIDE;
// XDispatchProviderInterception disambiguaiton
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list