[Libreoffice-commits] core.git: compilerplugins/clang sc/inc sc/source sdext/source sd/inc sd/source slideshow/source sw/inc sw/source ucb/source vcl/inc vcl/opengl vcl/source
Noel Grandin
noel at peralex.com
Thu Sep 22 18:58:53 UTC 2016
compilerplugins/clang/unusedmethods.py | 5
sc/inc/column.hxx | 1
sc/source/core/data/column2.cxx | 12
sc/source/filter/dif/difimp.cxx | 6
sc/source/filter/excel/namebuff.cxx | 18
sc/source/filter/inc/addressconverter.hxx | 12
sc/source/filter/inc/biffcodec.hxx | 13
sc/source/filter/inc/dif.hxx | 2
sc/source/filter/inc/drawingmanager.hxx | 11
sc/source/filter/inc/excelhandlers.hxx | 16
sc/source/filter/inc/externallinkbuffer.hxx | 2
sc/source/filter/inc/formulabase.hxx | 7
sc/source/filter/inc/namebuff.hxx | 2
sc/source/filter/inc/numberformatsbuffer.hxx | 2
sc/source/filter/inc/pivotcachefragment.hxx | 15
sc/source/filter/inc/stylesbuffer.hxx | 12
sc/source/filter/inc/workbookhelper.hxx | 6
sc/source/filter/inc/xetable.hxx | 2
sc/source/filter/oox/biffcodec.cxx | 11
sc/source/filter/oox/drawingmanager.cxx | 13
sc/source/filter/oox/excelhandlers.cxx | 8
sc/source/filter/oox/formulabase.cxx | 37
sc/source/filter/oox/numberformatsbuffer.cxx | 6
sc/source/filter/oox/pivotcachefragment.cxx | 55 -
sc/source/filter/oox/stylesbuffer.cxx | 46
sc/source/filter/oox/workbookhelper.cxx | 16
sc/source/filter/oox/worksheethelper.cxx | 1
sc/source/ui/condformat/condformatdlgitem.cxx | 9
sc/source/ui/docshell/impex.cxx | 43
sc/source/ui/inc/condformatdlgitem.hxx | 1
sc/source/ui/inc/docsh.hxx | 1
sc/source/ui/inc/impex.hxx | 1
sc/source/ui/optdlg/calcoptionsdlg.hxx | 2
sd/inc/sdmod.hxx | 13
sd/source/filter/eppt/eppt.hxx | 4
sd/source/filter/eppt/epptso.cxx | 517 ----------
sd/source/ui/app/sdmod1.cxx | 196 ---
sd/source/ui/dlg/TemplateScanner.cxx | 6
sd/source/ui/dlg/dlgctrls.cxx | 84 -
sd/source/ui/dlg/docprev.cxx | 37
sd/source/ui/inc/TemplateScanner.hxx | 18
sd/source/ui/inc/dlgctrls.hxx | 5
sd/source/ui/inc/docprev.hxx | 4
sd/source/ui/inc/filedlg.hxx | 1
sd/source/ui/sidebar/SlideBackground.cxx | 5
sd/source/ui/sidebar/SlideBackground.hxx | 1
sdext/source/pdfimport/inc/pdfparse.hxx | 2
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 17
sdext/source/presenter/PresenterPaneBase.cxx | 29
sdext/source/presenter/PresenterPaneBase.hxx | 1
sdext/source/presenter/PresenterWindowManager.hxx | 2
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 4
sw/inc/IDocumentUndoRedo.hxx | 4
sw/inc/docary.hxx | 3
sw/inc/tblafmt.hxx | 1
sw/inc/unodraw.hxx | 3
sw/source/core/doc/docfmt.cxx | 16
sw/source/core/inc/layfrm.hxx | 5
sw/source/core/unocore/unodraw.cxx | 6
sw/source/uibase/inc/navipi.hxx | 2
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 17
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 5
sw/source/uibase/utlui/navipi.cxx | 10
ucb/source/ucp/webdav-neon/DAVTypes.hxx | 1
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 18
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 4
vcl/inc/opengl/salbmp.hxx | 1
vcl/inc/opengl/texture.hxx | 1
vcl/opengl/salbmp.cxx | 5
vcl/opengl/texture.cxx | 7
vcl/source/filter/FilterConfigCache.cxx | 7
vcl/source/filter/FilterConfigCache.hxx | 1
72 files changed, 5 insertions(+), 1452 deletions(-)
New commits:
commit c4cd079b8f613084a99a83b95c3968b65cbd8900
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 22 15:08:42 2016 +0200
loplugin:unusedmethods in sc..vcl
Change-Id: I70fcf95dfd3db05b4fd6e5cee37866f673d3afa8
Reviewed-on: https://gerrit.libreoffice.org/29183
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index fb9412b..319e8ad 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -268,9 +268,12 @@ for d in definitionSet:
continue
if "::operator" in d[1]:
continue
+ location = definitionToSourceLocationMap[d];
+ # whacky template stuff
+ if location.startswith("sc/source/ui/vba/vbaformat.hxx"): continue
unusedSet.add(d) # used by the "unused return types" analysis
- tmp1set.add((method, definitionToSourceLocationMap[d]))
+ tmp1set.add((method, location))
# print out the results, sorted by name and line number
with open("loplugin.unusedmethods.report-methods", "wt") as f:
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index af73ff0..186e415 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -583,7 +583,6 @@ public:
void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1, SCROW nRow2 );
void PrepareBroadcastersForDestruction();
- bool HasBroadcaster() const;
void Broadcast( SCROW nRow );
void BroadcastCells( const std::vector<SCROW>& rRows, sal_uInt32 nHint );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 11e9396..37d8ccd 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1774,18 +1774,6 @@ void ScColumn::PrepareBroadcastersForDestruction()
}
}
-bool ScColumn::HasBroadcaster() const
-{
- sc::BroadcasterStoreType::const_iterator it = maBroadcasters.begin(), itEnd = maBroadcasters.end();
- for (; it != itEnd; ++it)
- {
- if (it->type == sc::element_type_broadcaster)
- // Having a broadcaster block automatically means there is at least one broadcaster.
- return true;
- }
- return false;
-}
-
ScPostIt* ScColumn::GetCellNote(SCROW nRow)
{
return maCellNotes.get<ScPostIt*>(nRow);
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 5b5b936..75013ba 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -648,12 +648,6 @@ void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat )
}
-void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& rPattAttr )
-{
- for (std::vector<ENTRY>::const_iterator it = maEntries.begin(); it != maEntries.end(); ++it)
- rDoc.ApplyPatternAreaTab( nCol, it->nStart, nCol, it->nEnd, nTab, rPattAttr );
-}
-
void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab )
{
ScPatternAttr aAttr( rDoc.GetPool() );
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 8947b3b..211cf25 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -157,29 +157,11 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex )
return false;
}
-void ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const
-{
- OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" );
-
- if (!nExcIndex || nExcIndex > maEntries.size() )
- return;
-
- const Cont &rRet = maEntries[ nExcIndex -1 ];
-
- rAppl = rRet.aFile;
- rDoc = rRet.aTab;
-}
-
void ExtSheetBuffer::Reset()
{
maEntries.clear();
}
-bool ExtName::IsDDE() const
-{
- return ( nFlags & 0x0001 ) != 0;
-}
-
bool ExtName::IsOLE() const
{
return ( nFlags & 0x0002 ) != 0;
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 58b8845..4e4ba70 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -107,12 +107,6 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinAddress&
return rStrm;
}
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinAddress& orPos )
-{
- orPos.read( rStrm );
- return rStrm;
-}
-
/** A 2D cell range address struct for binary filters. */
struct BinRange
{
@@ -129,12 +123,6 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& or
return rStrm;
}
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRange& orRange )
-{
- orRange.read( rStrm );
- return rStrm;
-}
-
/** A 2D cell range address list for binary filters. */
class BinRangeList
{
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index d64c9b8..929b3cb 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -133,19 +133,6 @@ private:
::std::vector< sal_uInt8 > maVerifierHash;
};
-/** Helper for BIFF stream codecs. Holds the used codec object. */
-class BiffCodecHelper : public WorkbookHelper
-{
-public:
- explicit BiffCodecHelper( const WorkbookHelper& rHelper );
-
- /** Clones the contained decoder object if existing and sets it at the passed stream. */
- void cloneDecoder( BiffInputStream& rStrm );
-
-private:
- BiffDecoderRef mxDecoder; /// The decoder for import filter.
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index 56d2e7d..0829155 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -145,8 +145,6 @@ class DifColumn
void NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat );
- void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& );
-
void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab );
};
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 2e8a873..e4f07a5 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -60,22 +60,11 @@ public:
explicit BiffDrawingBase( const WorksheetHelper& rHelper,
const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage );
- /** Final processing after import of the all drawing objects. */
- void finalizeImport();
-
private:
css::uno::Reference< css::drawing::XDrawPage >
mxDrawPage; /// UNO draw page used to insert the shapes.
};
-/** Drawing manager of a single sheet. */
-class BiffSheetDrawing : public BiffDrawingBase
-{
-public:
- explicit BiffSheetDrawing( const WorksheetHelper& rHelper );
-
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 3077c7d..9e73804 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -103,9 +103,6 @@ public:
virtual ~BiffFragmentHandler();
- /** Imports the fragment, returns true, if EOF record has been reached. */
- virtual bool importFragment() = 0;
-
protected:
/** Returns the BIFF input stream of this fragment. */
inline BiffInputStream& getInputStream() { return *mxBiffStrm; }
@@ -131,19 +128,6 @@ private:
BiffInputStreamRef mxBiffStrm;
};
-/** Fragment handler derived from the WorkbookHelper helper class.
-
- Used to import global workbook fragments.
- */
-class BiffWorkbookFragmentBase : public BiffFragmentHandler, public WorkbookHelper
-{
-protected:
- explicit BiffWorkbookFragmentBase(
- const WorkbookHelper& rHelper,
- const OUString& rStrmName,
- bool bCloneDecoder = false );
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 13250df..09e7c53 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -211,8 +211,6 @@ public:
/** Returns the type of this external link. */
inline ExternalLinkType getLinkType() const { return meLinkType; }
- /** Returns true, if the link refers to the current workbook. */
- inline bool isInternalLink() const { return (meLinkType == LINKTYPE_SELF) || (meLinkType == LINKTYPE_INTERNAL); }
/** Returns the relation identifier for the external link fragment. */
inline const OUString& getRelId() const { return maRelId; }
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 6076bbd..1e3a475 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -238,8 +238,6 @@ struct BinSingleRef2d
void setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset );
void readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset );
- void readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
- void readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
};
/** A 2D formula cell range reference struct with relative flags. */
@@ -249,8 +247,6 @@ struct BinComplexRef2d
BinSingleRef2d maRef2; /// End (bottom-right) cell address.
void readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset );
- void readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
- void readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
};
// Token vector, token sequence ===============================================
@@ -552,9 +548,6 @@ public:
/** Returns the function info for a BIFF12 function index, or 0 on error. */
const FunctionInfo* getFuncInfoFromBiff12FuncId( sal_uInt16 nFuncId ) const;
- /** Returns the function info for a BIFF2-BIFF8 function index, or 0 on error. */
- const FunctionInfo* getFuncInfoFromBiffFuncId( sal_uInt16 nFuncId ) const;
-
/** Returns the function info for a macro function referred by the
EXTERN.CALL function, or 0 on error. */
const FunctionInfo* getFuncInfoFromMacroName( const OUString& rFuncName ) const;
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index b60a2c4..71c8978 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -210,7 +210,6 @@ public:
const OUString& rTabName, const bool bSameWorkbook );
bool GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex );
- void GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const;
void Reset();
};
@@ -226,7 +225,6 @@ struct ExtName
inline ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}
- bool IsDDE() const;
bool IsOLE() const;
};
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index f37ac37..0031177 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -100,8 +100,6 @@ public:
sal_uLong fillToItemSet( SfxItemSet& rItemSet, sal_Int32 nNumFmtId, bool bSkipPoolDefs ) const;
- /** Writes the specified number format to the passed property map. */
- void writeToPropertyMap( PropertyMap& rPropMap, sal_Int32 nNumFmtId ) const;
sal_Int32 nextFreeId(){ return ++mnHighestId; }
private:
/** Inserts built-in number formats for the current system language. */
diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx
index 1de3815..e88b82c 100644
--- a/sc/source/filter/inc/pivotcachefragment.hxx
+++ b/sc/source/filter/inc/pivotcachefragment.hxx
@@ -88,21 +88,6 @@ private:
bool mbInRecord;
};
-class BiffPivotCacheFragment : public BiffWorkbookFragmentBase
-{
-public:
- explicit BiffPivotCacheFragment(
- const WorkbookHelper& rHelper,
- const OUString& rStrmName,
- PivotCache& rPivotCache );
-
- /** Imports the entire fragment, returns true, if EOF record has been reached. */
- virtual bool importFragment() override;
-
-private:
- PivotCache& mrPivotCache;
-};
-
class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase
{
public:
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index ead1094..820dda0 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -434,8 +434,6 @@ struct ApiBorderData
bool hasAnyOuterBorder() const;
};
-bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight );
-
class Border : public WorkbookHelper
{
public:
@@ -461,9 +459,6 @@ public:
void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
- /** Writes all border attributes to the passed property map. */
- void writeToPropertyMap( PropertyMap& rPropMap ) const;
-
private:
/** Returns the border line struct specified by the passed XML token identifier. */
BorderLineModel* getBorderLine( sal_Int32 nElement );
@@ -528,8 +523,6 @@ struct ApiSolidFillData
explicit ApiSolidFillData();
};
-bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight );
-
/** Contains cell fill attributes, either a pattern fill or a gradient fill. */
class Fill : public WorkbookHelper
{
@@ -563,12 +556,7 @@ public:
/** Final processing after import of all style settings. */
void finalizeImport();
- /** Returns the converted API fill data struct. */
- inline const ApiSolidFillData& getApiData() const { return maApiData; }
-
void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
- /** Writes all fill attributes to the passed property map. */
- void writeToPropertyMap( PropertyMap& rPropMap ) const;
private:
typedef std::shared_ptr< PatternFillModel > PatternModelRef;
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 453abd3..c3af3dd 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -73,7 +73,6 @@ struct IgnoreCaseCompare
};
class AddressConverter;
-class BiffCodecHelper;
class ConnectionsBuffer;
class DefinedNamesBuffer;
class ExcelChartConverter;
@@ -121,8 +120,6 @@ public:
::oox::core::FilterBase& getBaseFilter() const;
/** Returns the filter progress bar. */
SegmentProgressBar& getProgressBar() const;
- /** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
- bool isWorkbookFile() const;
/** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
sal_Int16 getCurrentSheetIndex() const;
@@ -268,9 +265,6 @@ public:
/** Returns the text encoding used to import/export byte strings. */
rtl_TextEncoding getTextEncoding() const;
- /** Returns the codec helper that stores the encoder/decoder object. */
- BiffCodecHelper& getCodecHelper() const;
-
private:
WorkbookGlobals& mrBookGlob;
};
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 4eaea15..16894b6 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -797,8 +797,6 @@ struct XclExpDefaultRowData
explicit XclExpDefaultRowData();
explicit XclExpDefaultRowData( const XclExpRow& rRow );
- /** Returns true, if rows are hidden by default. */
- inline bool IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); }
/** Returns true, if the rows have a manually set height by default. */
inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); }
};
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 65ce1f9..94a372a 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -220,17 +220,6 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD
}
}
-BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) :
- WorkbookHelper( rHelper )
-{
-}
-
-void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm )
-{
- if( mxDecoder.get() )
- rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) );
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index aabd92c..5810996 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -50,19 +50,6 @@ BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Referenc
{
}
-void BiffDrawingBase::finalizeImport()
-{
- Reference< XShapes > xShapes( mxDrawPage, UNO_QUERY );
- OSL_ENSURE( xShapes.is(), "BiffDrawingBase::finalizeImport - no shapes container" );
- if( !xShapes.is() )
- return;
-}
-
-BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
- BiffDrawingBase( rHelper, rHelper.getDrawPage() )
-{
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index b6d0c6e..f41dc97 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -67,14 +67,6 @@ bool BiffFragmentHandler::skipFragment()
return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF);
}
-BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rStrmName, bool bCloneDecoder ) :
- BiffFragmentHandler( rHelper.getBaseFilter(), rStrmName ),
- WorkbookHelper( rHelper )
-{
- if( bCloneDecoder )
- getCodecHelper().cloneDecoder( getInputStream() );
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 957740d..3e675a4 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -104,21 +104,6 @@ void BinSingleRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeA
setBiff12Data( nCol, nRow, bRelativeAsOffset );
}
-void BinSingleRef2d::readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset )
-{
- sal_uInt16 nRow;
- sal_uInt8 nCol;
- rStrm >> nRow >> nCol;
- setBiff2Data( nCol, nRow, bRelativeAsOffset );
-}
-
-void BinSingleRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset )
-{
- sal_uInt16 nRow, nCol;
- rStrm >> nRow >> nCol;
- setBiff8Data( nCol, nRow, bRelativeAsOffset );
-}
-
void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset )
{
sal_Int32 nRow1, nRow2;
@@ -131,23 +116,6 @@ void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelative
maRef2.setBiff12Data( nCol2, nRow2, bRelativeAsOffset );
}
-void BinComplexRef2d::readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset )
-{
- sal_uInt16 nRow1, nRow2;
- sal_uInt8 nCol1, nCol2;
- rStrm >> nRow1 >> nRow2 >> nCol1 >> nCol2;
- maRef1.setBiff2Data( nCol1, nRow1, bRelativeAsOffset );
- maRef2.setBiff2Data( nCol2, nRow2, bRelativeAsOffset );
-}
-
-void BinComplexRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset )
-{
- sal_uInt16 nRow1, nRow2, nCol1, nCol2;
- rStrm >> nRow1 >> nRow2 >> nCol1 >> nCol2;
- maRef1.setBiff8Data( nCol1, nRow1, bRelativeAsOffset );
- maRef2.setBiff8Data( nCol2, nRow2, bRelativeAsOffset );
-}
-
// token vector, sequence =====================================================
ApiTokenVector::ApiTokenVector()
@@ -1134,11 +1102,6 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromBiff12FuncId( sal_uInt16 nF
return mxFuncImpl->maBiff12Funcs.get( nFuncId ).get();
}
-const FunctionInfo* FunctionProvider::getFuncInfoFromBiffFuncId( sal_uInt16 nFuncId ) const
-{
- return mxFuncImpl->maBiffFuncs.get( nFuncId ).get();
-}
-
const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString& rFuncName ) const
{
return mxFuncImpl->maMacroFuncs.get( rFuncName ).get();
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 278a61c8..ac42d74 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2032,12 +2032,6 @@ sal_uLong NumberFormatsBuffer::fillToItemSet( SfxItemSet& rItemSet, sal_Int32 nN
return pNumFmt->fillToItemSet( rItemSet, bSkipPoolDefs);
}
-void NumberFormatsBuffer::writeToPropertyMap( PropertyMap& rPropMap, sal_Int32 nNumFmtId ) const
-{
- if( const NumberFormat* pNumFmt = maNumFmts.get( nNumFmtId ).get() )
- pNumFmt->writeToPropertyMap( rPropMap );
-}
-
void NumberFormatsBuffer::insertBuiltinFormats()
{
// build a map containing pointers to all tables
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index cf230fa..4f4498d 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -323,61 +323,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn
}
}
-namespace {
-
-bool lclSeekToPCDField( BiffInputStream& rStrm )
-{
- sal_Int64 nRecHandle = rStrm.getRecHandle();
- while( rStrm.startNextRecord() )
- if( rStrm.getRecId() == BIFF_ID_PCDFIELD )
- return true;
- rStrm.startRecordByHandle( nRecHandle );
- return false;
-}
-
-} // namespace
-
-BiffPivotCacheFragment::BiffPivotCacheFragment(
- const WorkbookHelper& rHelper, const OUString& rStrmName, PivotCache& rPivotCache ) :
- BiffWorkbookFragmentBase( rHelper, rStrmName, true ),
- mrPivotCache( rPivotCache )
-{
-}
-
-bool BiffPivotCacheFragment::importFragment()
-{
- BiffInputStream& rStrm = getInputStream();
- if( rStrm.startNextRecord() && (rStrm.getRecId() == BIFF_ID_PCDEFINITION) )
- {
- // read PCDEFINITION and optional PCDEFINITION2 records
- mrPivotCache.importPCDefinition( rStrm );
-
- // read cache fields as long as another PCDFIELD record can be found
- while( lclSeekToPCDField( rStrm ) )
- mrPivotCache.createCacheField( true ).importPCDField( rStrm );
-
- // finalize the cache (check source range etc.)
- mrPivotCache.finalizeImport();
-
- // load the cache records, if the cache is based on a deleted or an external worksheet
- if( mrPivotCache.isValidDataSource() && mrPivotCache.isBasedOnDummySheet() )
- {
- /* Last call of lclSeekToPCDField() failed and kept stream position
- unchanged. Stream should point to source data table now. */
- sal_Int16 nSheet = mrPivotCache.getSourceRange().Sheet;
- WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, ISegmentProgressBarRef(), SHEETTYPE_WORKSHEET, nSheet );
- if( xSheetGlob.get() )
- {
- BiffPivotCacheRecordsContext aContext( *xSheetGlob, mrPivotCache );
- while( rStrm.startNextRecord() && (rStrm.getRecId() != BIFF_ID_EOF) )
- aContext.importRecord( rStrm );
- }
- }
- }
-
- return rStrm.getRecId() == BIFF_ID_EOF;
-}
-
BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) :
BiffWorksheetContextBase( rHelper ),
mrPivotCache( rPivotCache ),
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 81ebec9..a00b0d5 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1392,19 +1392,6 @@ bool ApiBorderData::hasAnyOuterBorder() const
( ( lcl_isBorder( maRight ) && maRight.OuterLineWidth > 0 ) );
}
-bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight )
-{
- return
- (rLeft.maLeft == rRight.maLeft) &&
- (rLeft.maRight == rRight.maRight) &&
- (rLeft.maTop == rRight.maTop) &&
- (rLeft.maBottom == rRight.maBottom) &&
- (rLeft.maTLtoBR == rRight.maTLtoBR) &&
- (rLeft.maBLtoTR == rRight.maBLtoTR) &&
- (rLeft.mbBorderUsed == rRight.mbBorderUsed) &&
- (rLeft.mbDiagUsed == rRight.mbDiagUsed);
-}
-
namespace {
inline void lclSetBorderLineWidth( BorderLine& rBorderLine,
@@ -1540,22 +1527,6 @@ void Border::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const
}
}
-void Border::writeToPropertyMap( PropertyMap& rPropMap ) const
-{
- if( maApiData.mbBorderUsed )
- {
- rPropMap.setProperty( PROP_LeftBorder, maApiData.maLeft);
- rPropMap.setProperty( PROP_RightBorder, maApiData.maRight);
- rPropMap.setProperty( PROP_TopBorder, maApiData.maTop);
- rPropMap.setProperty( PROP_BottomBorder, maApiData.maBottom);
- }
- if( maApiData.mbDiagUsed )
- {
- rPropMap.setProperty( PROP_DiagonalTLBR, maApiData.maTLtoBR);
- rPropMap.setProperty( PROP_DiagonalBLTR, maApiData.maBLtoTR);
- }
-}
-
BorderLineModel* Border::getBorderLine( sal_Int32 nElement )
{
switch( nElement )
@@ -1694,14 +1665,6 @@ ApiSolidFillData::ApiSolidFillData() :
{
}
-bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight )
-{
- return
- (rLeft.mnColor == rRight.mnColor) &&
- (rLeft.mbTransparent == rRight.mbTransparent) &&
- (rLeft.mbUsed == rRight.mbUsed);
-}
-
namespace {
inline sal_Int32 lclGetMixedColorComp( sal_Int32 nPatt, sal_Int32 nFill, sal_Int32 nAlpha )
@@ -1939,15 +1902,6 @@ void Fill::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const
}
}
-void Fill::writeToPropertyMap( PropertyMap& rPropMap ) const
-{
- if( maApiData.mbUsed )
- {
- rPropMap.setProperty( PROP_CellBackColor, maApiData.mnColor);
- rPropMap.setProperty( PROP_IsCellBackgroundTransparent, maApiData.mbTransparent);
- }
-}
-
XfModel::XfModel() :
mnStyleXfId( -1 ),
mnFontId( -1 ),
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 4c30296..cc8bd24 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -128,8 +128,6 @@ public:
inline FilterBase& getBaseFilter() const { return mrBaseFilter; }
/** Returns the filter progress bar. */
inline SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
- /** Returns true, if the file is a multi-sheet document, or false if single-sheet. */
- inline bool isWorkbookFile() const { return mbWorkbook; }
/** Returns the VBA project storage. */
const StorageRef& getVbaProjectStorage() const { return mxVbaPrjStrg; }
/** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
@@ -226,8 +224,6 @@ public:
/** Returns the text encoding used to import/export byte strings. */
inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; }
- /** Returns the codec helper that stores the encoder/decoder object. */
- inline BiffCodecHelper& getCodecHelper() { return *mxCodecHelper; }
private:
/** Initializes some basic members and sets needed document properties. */
@@ -257,7 +253,6 @@ private:
typedef ::std::unique_ptr< AddressConverter > AddressConvPtr;
typedef ::std::unique_ptr< oox::drawingml::chart::ChartConverter > ExcelChartConvPtr;
typedef ::std::unique_ptr< PageSettingsConverter > PageSettConvPtr;
- typedef ::std::unique_ptr< BiffCodecHelper > BiffCodecHelperPtr;
OUString maCellStyles; /// Style family name for cell styles.
OUString maPageStyles; /// Style family name for page styles.
@@ -300,7 +295,6 @@ private:
XmlFilterBase* mpOoxFilter; /// Base OOXML/BIFF12 filter object.
// BIFF2-BIFF8 specific
- BiffCodecHelperPtr mxCodecHelper; /// Encoder/decoder helper.
rtl_TextEncoding meTextEnc; /// BIFF byte string text encoding.
ScDocument* mpDoc;
ScDocShell* mpDocShell;
@@ -664,11 +658,6 @@ SegmentProgressBar& WorkbookHelper::getProgressBar() const
return mrBookGlob.getProgressBar();
}
-bool WorkbookHelper::isWorkbookFile() const
-{
- return mrBookGlob.isWorkbookFile();
-}
-
sal_Int16 WorkbookHelper::getCurrentSheetIndex() const
{
return mrBookGlob.getCurrentSheetIndex();
@@ -975,11 +964,6 @@ rtl_TextEncoding WorkbookHelper::getTextEncoding() const
return mrBookGlob.getTextEncoding();
}
-BiffCodecHelper& WorkbookHelper::getCodecHelper() const
-{
- return mrBookGlob.getCodecHelper();
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 43c8848..bd03be3 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -374,7 +374,6 @@ private:
private:
typedef ::std::unique_ptr< VmlDrawing > VmlDrawingPtr;
- typedef ::std::unique_ptr< BiffSheetDrawing > BiffSheetDrawingPtr;
const OUString maSheetCellRanges; /// Service name for a SheetCellRanges object.
const ScAddress& mrMaxApiPos; /// Reference to maximum Calc cell address from address converter.
diff --git a/sc/source/ui/condformat/condformatdlgitem.cxx b/sc/source/ui/condformat/condformatdlgitem.cxx
index a4ef079..dc038c8 100644
--- a/sc/source/ui/condformat/condformatdlgitem.cxx
+++ b/sc/source/ui/condformat/condformatdlgitem.cxx
@@ -11,15 +11,6 @@
#include "scitems.hxx"
#include "condformatdlgitem.hxx"
-ScCondFormatDlgItem::ScCondFormatDlgItem():
- SfxPoolItem(SCITEM_CONDFORMATDLGDATA),
- mpCondFormats(),
- mnItem(-1),
- meDialogType(condformat::dialog::CONDITION),
- mbManaged(false)
-{
-}
-
ScCondFormatDlgItem::ScCondFormatDlgItem(std::shared_ptr<ScConditionalFormatList> pCondFormats,
sal_Int32 nItem, bool bManaged):
SfxPoolItem(SCITEM_CONDFORMATDLGDATA),
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 85efd9a..930c794 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -136,49 +136,6 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
aRange.aEnd.SetTab( aRange.aStart.Tab() );
}
-// Evaluate input string - either range, cell or the whole document (when error)
-// If a View exists, the TabNo of the view will be used.
-ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
- : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ),
- nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
- bFormulas( false ), bIncludeFiltered( true ),
- bAll( false ), bSingle( true ), bUndo( pDocSh != nullptr ),
- bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
- mExportTextOptions()
-{
- pUndoDoc = nullptr;
- pExtOptions = nullptr;
-
- SCTAB nTab = ScDocShell::GetCurTab();
- aRange.aStart.SetTab( nTab );
- OUString aPos( rPos );
- // Named range?
- ScRangeName* pRange = pDoc->GetRangeName();
- if (pRange)
- {
- const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos));
- if (pData)
- {
- if( pData->HasType( ScRangeData::Type::RefArea )
- || pData->HasType( ScRangeData::Type::AbsArea )
- || pData->HasType( ScRangeData::Type::AbsPos ) )
- {
- pData->GetSymbol(aPos);
- }
- }
- }
- formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- // Range?
- if (aRange.Parse(aPos, pDoc, eConv) & ScRefFlags::VALID)
- bSingle = false;
- // Cell?
- else if (aRange.aStart.Parse(aPos, pDoc, eConv) & ScRefFlags::VALID)
- aRange.aEnd = aRange.aStart;
- else
- bAll = true;
-}
-
ScImportExport::~ScImportExport()
{
delete pUndoDoc;
diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx
index d974b2c..e14e3d5 100644
--- a/sc/source/ui/inc/condformatdlgitem.hxx
+++ b/sc/source/ui/inc/condformatdlgitem.hxx
@@ -38,7 +38,6 @@ class ScCondFormatDlgItem : public SfxPoolItem
{
public:
- ScCondFormatDlgItem();
ScCondFormatDlgItem(std::shared_ptr<ScConditionalFormatList> pCondFormats, sal_Int32 nItem, bool bManaged);
virtual ~ScCondFormatDlgItem() override;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 80f16e1..e549345 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -225,7 +225,6 @@ public:
ScDocument& GetDocument() { return aDocument; }
ScDocFunc& GetDocFunc() { return *pDocFunc; }
- void SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
SfxPrinter* GetPrinter( bool bCreateIfNotExist = true );
sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index b0be3ef..b5b69f6 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -89,7 +89,6 @@ class ScImportExport
public:
ScImportExport( ScDocument* ); // the whole document
- ScImportExport( ScDocument*, const OUString& ); // Range/cell input
ScImportExport( ScDocument*, const ScAddress& );
ScImportExport( ScDocument*, const ScRange& );
~ScImportExport();
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 00e6241..161e99d 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -47,8 +47,6 @@ public:
bool GetWriteCalcConfig() const { return mbWriteConfig;}
private:
- void OpenCLAutomaticSelectionChanged();
- void SelectedDeviceChanged();
void CoupleEmptyAsZeroToStringConversion();
private:
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 27673c0..74023c5 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -149,7 +149,6 @@ protected:
private:
SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
- static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
static SfxFrame* CreateEmptyDocument( const css::uno::Reference< css::frame::XFrame >& i_rFrame );
static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
@@ -159,18 +158,6 @@ private:
bool mbEventListenerAdded;
- /** Create a new summary page. When the document has been created in
- the kiosk mode with automatical transitions then this method adds
- this kind of transition to the new summary page.
- @param pViewFrame
- The view frame that is used to execute the slot for creating the
- summary page.
- @param pDocument
- The document which will contain the summary page and from which
- the information about the default transition is retrieved.
- */
- static void AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocument);
-
/** Take an outline from a text document and create a new impress
document according to the structure of the outline.
@param rRequest
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index ce04eaa..98718fe 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -234,10 +234,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
css::presentation::AnimationEffect& eEffect,
css::presentation::AnimationEffect& eTextEffect,
bool& bHasSound );
- void ImplWriteObjectEffect( SvStream& rSt,
- css::presentation::AnimationEffect eEffect,
- css::presentation::AnimationEffect eTextEffect,
- sal_Int32 nOrder );
void ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAction eAction, bool bMediaClickAction );
void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj );
void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 206f062..0161375 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1378,523 +1378,6 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
}
}
-void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
- css::presentation::AnimationEffect eAe,
- css::presentation::AnimationEffect eTe,
- sal_Int32 nOrder )
-{
- EscherExContainer aAnimationInfo( rSt, EPP_AnimationInfo );
- EscherExAtom aAnimationInfoAtom( rSt, EPP_AnimationInfoAtom, 0, 1 );
- sal_uInt32 nDimColor = 0x7000000; // color to use for dimming
- sal_uInt32 nFlags = 0x4400; // set of flags that determine type of build
- sal_uInt32 nSoundRef = 0; // 0 if storage is from clipboard. Otherwise index(ID) in SoundCollection list.
- sal_uInt32 nDelayTime = 0; // delay before playing object
- sal_uInt16 nSlideCount = 1; // number of slides to play object
- sal_uInt8 nBuildType = 1; // type of build
- sal_uInt8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc )
- sal_uInt8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc )
- sal_uInt8 nAfterEffect = 0; // what to do after build
- sal_uInt8 nSubEffect = 0; // build by word or letter
- sal_uInt8 nOleVerb = 0; // Determines object's class (sound, video, other)
-
- if ( eAe == css::presentation::AnimationEffect_NONE )
- {
- nBuildType = 0;
- eAe = eTe;
- }
- switch ( eAe )
- {
- case css::presentation::AnimationEffect_NONE :
- break;
- case css::presentation::AnimationEffect_FADE_FROM_LEFT :
- {
- nFlyDirection = 2;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_TOP :
- {
- nFlyDirection = 3;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_RIGHT :
- {
- nFlyDirection = 0;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_BOTTOM :
- {
- nFlyDirection = 1;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_FADE_TO_CENTER :
- {
- nFlyDirection = 1;
- nFlyMethod = 11;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_CENTER :
- {
- nFlyDirection = 0;
- nFlyMethod = 11;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_LEFT :
- {
- nFlyDirection = 0;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_TOP :
- {
- nFlyDirection = 1;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_RIGHT :
- {
- nFlyDirection = 2;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_BOTTOM :
- {
- nFlyDirection = 3;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_VERTICAL_STRIPES :
- {
- nFlyDirection = 0;
- nFlyMethod = 2;
- }
- break;
- case css::presentation::AnimationEffect_HORIZONTAL_STRIPES :
- {
- nFlyDirection = 1;
- nFlyMethod = 2;
- }
- break;
- case css::presentation::AnimationEffect_CLOCKWISE :
- {
- nFlyDirection = 1;
- nFlyMethod = 3;
- }
- break;
- case css::presentation::AnimationEffect_COUNTERCLOCKWISE :
- {
- nFlyDirection = 0;
- nFlyMethod = 3;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_UPPERLEFT :
- {
- nFlyDirection = 7;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT :
- {
- nFlyDirection = 6;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_LOWERLEFT :
- {
- nFlyDirection = 5;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT :
- {
- nFlyDirection = 4;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_CLOSE_VERTICAL :
- {
- nFlyDirection = 1;
- nFlyMethod = 13;
- }
- break;
- case css::presentation::AnimationEffect_CLOSE_HORIZONTAL :
- {
- nFlyDirection = 3;
- nFlyMethod = 13;
- }
- break;
- case css::presentation::AnimationEffect_OPEN_VERTICAL :
- {
- nFlyDirection = 0;
- nFlyMethod = 13;
- }
- break;
- case css::presentation::AnimationEffect_OPEN_HORIZONTAL :
- {
- nFlyDirection = 2;
- nFlyMethod = 13;
- }
- break;
- case css::presentation::AnimationEffect_PATH :
- {
- nFlyDirection = 28;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_TO_LEFT :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_TO_TOP :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_TO_RIGHT :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_TO_BOTTOM :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_SPIRALIN_LEFT :
- case css::presentation::AnimationEffect_SPIRALIN_RIGHT :
- case css::presentation::AnimationEffect_SPIRALOUT_LEFT :
- case css::presentation::AnimationEffect_SPIRALOUT_RIGHT :
- {
- nFlyDirection = 0x1c;
- nFlyMethod = 0xc;
- }
- break;
- case css::presentation::AnimationEffect_DISSOLVE :
- {
- nFlyDirection = 0;
- nFlyMethod = 5;
- }
- break;
- case css::presentation::AnimationEffect_WAVYLINE_FROM_LEFT :
- {
- nFlyDirection = 2;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_WAVYLINE_FROM_TOP :
- {
- nFlyDirection = 3;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_WAVYLINE_FROM_RIGHT :
- {
- nFlyDirection = 0;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_WAVYLINE_FROM_BOTTOM :
- {
- nFlyDirection = 1;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_RANDOM :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_VERTICAL_LINES :
- {
- nFlyDirection = 1;
- nFlyMethod = 8;
- }
- break;
- case css::presentation::AnimationEffect_HORIZONTAL_LINES :
- {
- nFlyDirection = 0;
- nFlyMethod = 8;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_LEFT :
- {
- nFlyDirection = 2;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_TOP :
- {
- nFlyDirection = 3;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_RIGHT :
- {
- nFlyDirection = 0;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_BOTTOM :
- {
- nFlyDirection = 1;
- nFlyMethod = 10;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_UPPERLEFT :
- {
- nFlyDirection = 7;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_UPPERRIGHT :
- {
- nFlyDirection = 6;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_LOWERLEFT :
- {
- nFlyDirection = 5;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_LASER_FROM_LOWERRIGHT :
- {
- nFlyDirection = 4;
- nFlyMethod = 9;
- }
- break;
- case css::presentation::AnimationEffect_APPEAR :
- break;
- case css::presentation::AnimationEffect_HIDE :
- {
- nFlyDirection = 0;
- nFlyMethod = 1;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_UPPERLEFT :
- {
- nFlyDirection = 4;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_UPPERRIGHT :
- {
- nFlyDirection = 5;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_LOWERRIGHT :
- {
- nFlyDirection = 7;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_FROM_LOWERLEFT :
- {
- nFlyDirection = 6;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_TO_UPPERLEFT :
- case css::presentation::AnimationEffect_MOVE_TO_UPPERRIGHT :
- case css::presentation::AnimationEffect_MOVE_TO_LOWERRIGHT :
- case css::presentation::AnimationEffect_MOVE_TO_LOWERLEFT :
- nAfterEffect |= 2;
- break;
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT :
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_UPPERLEFT :
- {
- nFlyDirection = 8;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_TOP :
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_UPPERRIGHT :
- {
- nFlyDirection = 11;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_RIGHT :
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_LOWERRIGHT :
- {
- nFlyDirection = 10;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM :
- case css::presentation::AnimationEffect_MOVE_SHORT_FROM_LOWERLEFT :
- {
- nFlyDirection = 9;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_LEFT :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_UPPERLEFT :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_TOP :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_UPPERRIGHT :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_RIGHT :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_LOWERRIGHT :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_BOTTOM :
- case css::presentation::AnimationEffect_MOVE_SHORT_TO_LOWERLEFT :
- nAfterEffect |= 2;
- break;
- case css::presentation::AnimationEffect_VERTICAL_CHECKERBOARD :
- {
- nFlyDirection = 1;
- nFlyMethod = 3;
- }
- break;
- case css::presentation::AnimationEffect_HORIZONTAL_CHECKERBOARD :
- {
- nFlyDirection = 0;
- nFlyMethod = 3;
- }
- break;
- case css::presentation::AnimationEffect_HORIZONTAL_ROTATE :
- case css::presentation::AnimationEffect_VERTICAL_ROTATE :
- {
- nFlyDirection = 27;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_HORIZONTAL_STRETCH :
- case css::presentation::AnimationEffect_VERTICAL_STRETCH :
- {
- nFlyDirection = 22;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_STRETCH_FROM_LEFT :
- case css::presentation::AnimationEffect_STRETCH_FROM_UPPERLEFT :
- {
- nFlyDirection = 23;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_STRETCH_FROM_TOP :
- case css::presentation::AnimationEffect_STRETCH_FROM_UPPERRIGHT :
- {
- nFlyDirection = 24;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_STRETCH_FROM_RIGHT :
- case css::presentation::AnimationEffect_STRETCH_FROM_LOWERRIGHT :
- {
- nFlyDirection = 25;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_STRETCH_FROM_BOTTOM :
- case css::presentation::AnimationEffect_STRETCH_FROM_LOWERLEFT :
- {
- nFlyDirection = 26;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_IN :
- {
- nFlyDirection = 16;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_IN_SMALL :
- case css::presentation::AnimationEffect_ZOOM_IN_SPIRAL :
- {
- nFlyDirection = 17;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_OUT :
- {
- nFlyDirection = 18;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_OUT_SMALL :
- case css::presentation::AnimationEffect_ZOOM_OUT_SPIRAL :
- {
- nFlyDirection = 19;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_LEFT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_UPPERLEFT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_TOP :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_UPPERRIGHT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_RIGHT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_LOWERRIGHT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_BOTTOM :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_LOWERLEFT :
- case css::presentation::AnimationEffect_ZOOM_IN_FROM_CENTER :
- {
- nFlyDirection = 16;
- nFlyMethod = 12;
- }
- break;
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_LEFT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_UPPERLEFT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_TOP :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_UPPERRIGHT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_RIGHT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_BOTTOM :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_LOWERLEFT :
- case css::presentation::AnimationEffect_ZOOM_OUT_FROM_CENTER :
- nAfterEffect |= 2;
- break;
- default:
- break;
- }
- if ( mnDiaMode >= 1 )
- nFlags |= 4;
- if ( eTe != css::presentation::AnimationEffect_NONE )
- nBuildType = 2;
- if ( ImplGetPropertyValue( "SoundOn" ) )
- {
- bool bBool(false);
- mAny >>= bBool;
- if ( bBool )
- {
- if ( ImplGetPropertyValue( "Sound" ) )
- {
- nSoundRef = maSoundCollection.GetId( *o3tl::doAccess<OUString>(mAny) );
- if ( nSoundRef )
- nFlags |= 0x10;
- }
- }
- }
- bool bDimHide = false;
- bool bDimPrevious = false;
- if ( ImplGetPropertyValue( "DimHide" ) )
- mAny >>= bDimHide;
- if ( ImplGetPropertyValue( "DimPrevious" ) )
- mAny >>= bDimPrevious;
- if ( bDimPrevious )
- nAfterEffect |= 1;
- if ( bDimHide )
- nAfterEffect |= 2;
- if ( ImplGetPropertyValue( "DimColor" ) )
- nDimColor = EscherEx::GetColor( *o3tl::doAccess<sal_uInt32>(mAny) ) | 0xfe000000;
-
- rSt.WriteUInt32( nDimColor ).WriteUInt32( nFlags ).WriteUInt32( nSoundRef ).WriteUInt32( nDelayTime )
- .WriteUInt16( basegfx::clamp<sal_Int32>(nOrder, 0, SAL_MAX_UINT16) ) // order of build ( 1.. )
- .WriteUInt16( nSlideCount ).WriteUChar( nBuildType ).WriteUChar( nFlyMethod ).WriteUChar( nFlyDirection )
- .WriteUChar( nAfterEffect ).WriteUChar( nSubEffect ).WriteUChar( nOleVerb )
- .WriteUInt16( 0 ); // PadWord
-}
-
void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAction eCa, bool bMediaClickAction )
{
sal_uInt32 nSoundRef = 0; // a reference to a sound in the sound collection, or NULL.
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index b8872e3..147a1ca 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -449,45 +449,6 @@ IMPL_STATIC_LINK_TYPED( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEven
}
}
-void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocument)
-{
- if( !pViewFrame || !pViewFrame->GetDispatcher() || !pDocument )
- return;
-
- pViewFrame->GetDispatcher()->Execute(SID_SUMMARY_PAGE,
- SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
-
- OSL_ASSERT (pDocument!=nullptr);
-
- sal_Int32 nPageCount = pDocument->GetSdPageCount (PK_STANDARD);
-
- // We need at least two pages: the summary page and one to use as
- // template to take the transition parameters from.
- if (nPageCount >= 2)
- {
- // Get a page from which to retrieve the transition parameters.
- SdPage* pTemplatePage = pDocument->GetSdPage (0, PK_STANDARD);
- OSL_ASSERT (pTemplatePage!=nullptr);
-
- // The summary page, if it exists, is the last page.
- SdPage* pSummaryPage = pDocument->GetSdPage (
- (sal_uInt16)nPageCount-1, PK_STANDARD);
- OSL_ASSERT (pSummaryPage!=nullptr);
-
- // Take the change mode of the template page as indication of the
- // document's kiosk mode.
- pSummaryPage->setTransitionDuration(pTemplatePage->getTransitionDuration());
- pSummaryPage->SetPresChange(pTemplatePage->GetPresChange());
- pSummaryPage->SetTime(pTemplatePage->GetTime());
- pSummaryPage->SetSound(pTemplatePage->IsSoundOn());
- pSummaryPage->SetSoundFile(pTemplatePage->GetSoundFile());
- pSummaryPage->setTransitionType(pTemplatePage->getTransitionType());
- pSummaryPage->setTransitionSubtype(pTemplatePage->getTransitionSubtype());
- pSummaryPage->setTransitionDirection(pTemplatePage->getTransitionDirection());
- pSummaryPage->setTransitionFadeColor(pTemplatePage->getTransitionFadeColor());
- pSummaryPage->setTransitionDuration(pTemplatePage->getTransitionDuration());
- }
-}
SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Reference< XFrame >& i_rFrame )
{
@@ -592,163 +553,6 @@ SfxFrame* SdModule::CreateEmptyDocument( const Reference< XFrame >& i_rFrame )
return pFrame;
}
-void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium )
-{
- if( !pDocShell )
- return;
-
- SdDrawDocument* pDoc = pDocShell->GetDoc();
- if( !pDoc )
- return;
-
- // settings for the Outputmedium
- Size aNewSize;
- sal_uInt32 nLeft = 0;
- sal_uInt32 nRight = 0;
- sal_uInt32 nLower = 0;
- sal_uInt32 nUpper = 0;
- switch(eMedium)
- {
- case OUTPUT_PAGE:
- case OUTPUT_OVERHEAD:
- {
- SfxPrinter* pPrinter = pDocShell->GetPrinter(true);
-
- if( pPrinter && pPrinter->IsValid())
- {
- // Unfortunately, the printer does not provide an exact format
- // like A4
- Size aSize(pPrinter->GetPaperSize());
- Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, true);
-
- if (ePaper != PAPER_USER)
- {
- // get correct size
- aSize = SvxPaperInfo::GetPaperSize(ePaper, MAP_100TH_MM);
- }
-
- if (aSize.Height() > aSize.Width())
- {
- // always landscape
- aNewSize.Width() = aSize.Height();
- aNewSize.Height() = aSize.Width();
- }
- else
- {
- aNewSize = aSize;
- }
- }
- else
- {
- aNewSize=Size(29700, 21000);
- }
-
- if (eMedium == OUTPUT_PAGE)
- {
- nLeft =1000;
- nRight=1000;
- nUpper=1000;
- nLower=1000;
- }
- else
- {
- nLeft =0;
- nRight=0;
- nUpper=0;
- nLower=0;
- }
- }
- break;
-
- case OUTPUT_SLIDE:
- {
- aNewSize = Size(27000, 18000);
- nLeft =0;
- nRight=0;
- nUpper=0;
- nLower=0;
- }
- break;
-
- case OUTPUT_WIDESCREEN:
- {
- aNewSize = Size(28000, 15750);
- nLeft =0;
- nRight=0;
- nUpper=0;
- nLower=0;
- }
- break;
-
- case OUTPUT_PRESENTATION:
- {
- aNewSize = Size(28000, 21000);
- nLeft =0;
- nRight=0;
- nUpper=0;
- nLower=0;
- }
- break;
- }
-
- bool bScaleAll = true;
- sal_uInt16 nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD);
- sal_uInt16 i;
- SdPage* pPage;
-
- // master pages first
- for (i = 0; i < nPageCnt; i++)
- {
- pPage = pDoc->GetMasterSdPage(i, PK_STANDARD);
-
- if (pPage)
- {
- if(eMedium != OUTPUT_ORIGINAL)
- {
- Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pPage->ScaleObjects(aNewSize, aBorderRect, bScaleAll);
- pPage->SetSize(aNewSize);
- pPage->SetBorder(nLeft, nUpper, nRight, nLower);
- }
- SdPage* pNotesPage = pDoc->GetMasterSdPage(i, PK_NOTES);
- DBG_ASSERT( pNotesPage, "Wrong page ordering!" );
- if( pNotesPage ) pNotesPage->CreateTitleAndLayout();
- pPage->CreateTitleAndLayout();
- }
- }
-
- nPageCnt = pDoc->GetSdPageCount(PK_STANDARD);
-
- // then slides
- for (i = 0; i < nPageCnt; i++)
- {
- pPage = pDoc->GetSdPage(i, PK_STANDARD);
-
- if (pPage)
- {
- if(eMedium != OUTPUT_ORIGINAL)
- {
- Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pPage->ScaleObjects(aNewSize, aBorderRect, bScaleAll);
- pPage->SetSize(aNewSize);
- pPage->SetBorder(nLeft, nUpper, nRight, nLower);
- }
- SdPage* pNotesPage = pDoc->GetSdPage(i, PK_NOTES);
- DBG_ASSERT( pNotesPage, "Wrong page ordering!" );
- if( pNotesPage ) pNotesPage->SetAutoLayout( pNotesPage->GetAutoLayout() );
- pPage->SetAutoLayout( pPage->GetAutoLayout() );
- }
- }
-
- SdPage* pHandoutPage = pDoc->GetSdPage(0, PK_HANDOUT);
- pHandoutPage->CreateTitleAndLayout(true);
-
- if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher())
- {
- pViewFrame->GetDispatcher()->Execute(SID_SIZE_PAGE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
- }
-}
-
//===== OutlineToImpressFinalize ==============================================
namespace {
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index e0d7902..0f6723d 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -374,12 +374,6 @@ TemplateScanner::State TemplateScanner::ScanFolder()
return eNextState;
}
-void TemplateScanner::Scan()
-{
- while (HasNextStep())
- RunNextStep();
-}
-
void TemplateScanner::RunNextStep()
{
switch (meState)
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index ff61414..6f29aeb 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -58,58 +58,6 @@ void FadeEffectLB::dispose()
ListBox::dispose();
}
-void FadeEffectLB::Fill()
-{
- InsertEntry( SD_RESSTR( STR_EFFECT_NONE ) );
- mpImpl->maPresets.push_back( TransitionPresetPtr() );
- mpImpl->maSet.push_back( "" );
-
- const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList();
-
- for( auto aIter = rPresetList.begin(); aIter != rPresetList.end(); ++aIter )
- {
- TransitionPresetPtr pPreset = *aIter;
- const OUString sLabel( pPreset->getSetLabel() );
- if( !sLabel.isEmpty() )
- {
- if( mpImpl->maNumVariants.find( pPreset->getSetId() ) == mpImpl->maNumVariants.end() )
- {
- InsertEntry( sLabel );
- mpImpl->maSet.push_back( pPreset->getSetId() );
- mpImpl->maNumVariants[pPreset->getSetId()] = 1;
- }
- else
- {
- mpImpl->maNumVariants[pPreset->getSetId()]++;
- }
- mpImpl->maPresets.push_back( pPreset );
- }
- }
-
- assert( static_cast<size_t>( GetEntryCount() ) == mpImpl->maSet.size() );
- assert( mpImpl->maPresets.size() == 1 + TransitionPreset::getTransitionPresetList().size() );
-
- SelectEntryPos(0);
-}
-
-void FadeEffectLB::FillVariantLB(ListBox& rVariantLB)
-{
- rVariantLB.Clear();
- for( auto aIter = mpImpl->maPresets.begin(); aIter != mpImpl->maPresets.end(); ++aIter )
- {
- TransitionPresetPtr pPreset = *aIter;
- if( !pPreset )
- continue;
- const OUString sLabel( pPreset->getSetLabel() );
- if( !sLabel.isEmpty() && mpImpl->maSet[GetSelectEntryPos()].equals( pPreset->getSetId() ) )
- {
- rVariantLB.InsertEntry( pPreset->getVariantLabel() );
- }
- }
- if( rVariantLB.GetEntryCount() > 0 )
- rVariantLB.SelectEntryPos( 0 );
-}
-
VCL_BUILDER_DECL_FACTORY(FadeEffectLB)
{
WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
@@ -122,37 +70,5 @@ VCL_BUILDER_DECL_FACTORY(FadeEffectLB)
rRet = VclPtr<FadeEffectLB>::Create(pParent, nBits);
}
-void FadeEffectLB::applySelected( SdPage* pSlide, ListBox& rVariantLB ) const
-{
- if( !pSlide )
- return;
-
- if( GetSelectEntryPos() == 0 )
- {
- pSlide->setTransitionType( 0 );
- pSlide->setTransitionSubtype( 0 );
- pSlide->setTransitionDirection( true );
- pSlide->setTransitionFadeColor( 0 );
- return;
- }
-
- int nMatch = 0;
- for( auto aIter = mpImpl->maPresets.begin(); aIter != mpImpl->maPresets.end(); ++aIter )
- {
- TransitionPresetPtr pPreset = *aIter;
- if( !pPreset )
- continue;
- const OUString sLabel( pPreset->getSetLabel() );
- if( !sLabel.isEmpty() && mpImpl->maSet[GetSelectEntryPos()].equals( pPreset->getSetId() ) )
- {
- if( nMatch == rVariantLB.GetSelectEntryPos() )
- {
- pPreset->apply( pSlide );
- break;
- }
- nMatch++;
- }
- }
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index cc1f3bb..e907524 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -50,18 +50,6 @@ using namespace ::com::sun::star::uno;
const int SdDocPreviewWin::FRAME = 4;
-void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage )
-{
- mpObj = pObj;
- mnShowPage = nShowPage;
- if (mxSlideShow.is())
- {
- mxSlideShow->end();
- mxSlideShow.clear();
- }
- updateViewSettings();
-}
-
VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin)
{
WinBits nWinStyle = 0;
@@ -175,31 +163,6 @@ void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Recta
}
}
-void SdDocPreviewWin::startPreview()
-{
- ::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell * >( mpObj );
- if( pDocShell )
- {
- SdDrawDocument* pDoc = pDocShell->GetDoc();
-
- if( pDoc )
- {
- SdPage* pPage = pDoc->GetSdPage( mnShowPage, PK_STANDARD );
-
- if( pPage && (pPage->getTransitionType() != 0) )
- {
- if( !mxSlideShow.is() )
- mxSlideShow = sd::SlideShow::Create( pDoc );
-
- Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY );
- Reference< XAnimationNode > xAnimationNode;
-
- mxSlideShow->startPreview( xDrawPage, xAnimationNode, this );
- }
- }
- }
-}
-
bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 106559e..fdd6f5b 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -110,19 +110,6 @@ public:
*/
virtual ~TemplateScanner();
- /** Execute the actual scanning of templates. When this method
- terminates the result can be obtained by calling the
- <member>GetTemplateList</member> method.
- */
- void Scan();
-
- /** Return the list of template folders. It lies in the responsibility
- of the caller to take ownership of some or all entries and remove
- them from the returned list. All entries that remain until the
- destructor is called will be destroyed.
- */
- std::vector<TemplateDir*>& GetFolderList() { return maFolderList;}
-
/** Implementation of the AsynchronousTask interface method.
*/
virtual void RunNextStep() override;
@@ -139,11 +126,6 @@ public:
*/
const TemplateEntry* GetLastAddedEntry() const { return mpLastAddedEntry;}
- /** Set whether to sort the template entries inside the regions.
- */
- void EnableEntrySorting ()
- {mbEntrySortingEnabled = true;}
-
private:
/** The current state determines which step will be executed next by
RunNextStep().
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
index 06bec93..bbc76b6 100644
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ b/sd/source/ui/inc/dlgctrls.hxx
@@ -38,11 +38,6 @@ public:
FadeEffectLB(vcl::Window* pParent, WinBits nStyle);
virtual ~FadeEffectLB() override;
virtual void dispose() override;
- void Fill();
-
- void FillVariantLB(ListBox& rVariantLB);
-
- void applySelected( SdPage* pSlide, ListBox& rVariantLB ) const;
FadeEffectLBImpl* mpImpl;
};
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index ddcae4b..ad2b14e 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -63,14 +63,10 @@ public:
SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle );
virtual ~SdDocPreviewWin() override;
virtual void dispose() override;
- void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage );
virtual void Resize() override;
- void startPreview();
virtual bool Notify( NotifyEvent& rNEvt ) override;
- void SetClickHdl( const Link<SdDocPreviewWin&,void>& rLink ) { aClickHdl = rLink; }
-
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index 68e507c..918a956 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -50,6 +50,7 @@ public:
ErrCode Execute();
OUString GetPath() const;
void SetPath( const OUString& rPath );
+ // WIP, please don't remove, dear Clang plugins
bool IsInsertAsLinkSelected();
};
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 4d7b6f4..2258495 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -135,11 +135,6 @@ SlideBackground::~SlideBackground()
disposeOnce();
}
-bool SlideBackground::IsDraw()
-{
- return ( maApplication == vcl::EnumContext::Application_Draw );
-}
-
bool SlideBackground::IsImpress()
{
return ( maApplication == vcl::EnumContext::Application_Impress );
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 7514b43..ed41aa0 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -137,7 +137,6 @@ private:
const OUString GetBitmapSetOrDefault();
const OUString GetPatternSetOrDefault();
bool IsImpress();
- bool IsDraw();
void addListener();
void removeListener();
void populateMasterSlideDropdown();
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index f11c833..a43bfbb 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -255,8 +255,6 @@ public:
bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen,
sal_uInt8* pOutBuffer,
unsigned int nObject, unsigned int nGeneration ) const;
-
- OUString getDecryptionKey() const;
};
struct PDFObject : public PDFContainer
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 01e9893..237609e 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1262,23 +1262,6 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const
return bValid;
}
-OUString PDFFile::getDecryptionKey() const
-{
- OUStringBuffer aBuf( ENCRYPTION_KEY_LEN * 2 );
- if( impl_getData()->m_bIsEncrypted )
- {
- for( sal_uInt32 i = 0; i < m_pData->m_nKeyLength; i++ )
- {
- static const sal_Unicode pHexTab[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
- aBuf.append( pHexTab[(m_pData->m_aDecryptionKey[i] >> 4) & 0x0f] );
- aBuf.append( pHexTab[(m_pData->m_aDecryptionKey[i] & 0x0f)] );
- }
-
- }
- return aBuf.makeStringAndClear();
-}
-
PDFFileImplData* PDFFile::impl_getData() const
{
if( m_pData )
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 6b4e5f9..c8497ff 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -127,35 +127,6 @@ const Reference<drawing::framework::XPaneBorderPainter>&
return mxBorderPainter;
}
-void PresenterPaneBase::SetCalloutAnchor (const css::awt::Point& rCalloutAnchor)
-{
- mbHasCallout = true;
- // Anchor is given in the coordinate system of the parent window.
- // Transform it into the local coordinate system.
- maCalloutAnchor = rCalloutAnchor;
- const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize());
- maCalloutAnchor.X -= aBorderBox.X;
- maCalloutAnchor.Y -= aBorderBox.Y;
-
- // Move the bottom of the border window so that it goes through the
- // callout anchor (special case for bottom callout).
- sal_Int32 nHeight (rCalloutAnchor.Y - aBorderBox.Y);
- if (mxBorderPainter.is() && mxPaneId.is())
- nHeight += mxBorderPainter->getCalloutOffset(mxPaneId->getResourceURL()).Y;
-
- if (nHeight != aBorderBox.Height)
- {
- mxBorderWindow->setPosSize(
- aBorderBox.X,
- aBorderBox.Y,
- aBorderBox.Width,
- nHeight,
- awt::PosSize::HEIGHT);
- }
-
- mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
-}
-
const awt::Point& PresenterPaneBase::GetCalloutAnchor() const
{
return maCalloutAnchor;
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 1211ab7..e46c5d0 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -76,7 +76,6 @@ public:
void SetTitle (const OUString& rsTitle);
const OUString& GetTitle() const;
const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const;
- void SetCalloutAnchor (const css::awt::Point& rAnchorPosition);
const css::awt::Point& GetCalloutAnchor() const;
// XInitialization
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index bca8590..13115fb 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -193,8 +193,6 @@ private:
void ProvideBackgroundBitmap();
css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon() const;
- static void UpdateWindowList();
-
void Invalidate();
void StoreViewMode (const ViewMode eViewMode);
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 2a7c472..66ecb6b 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -67,10 +67,6 @@ typedef std::vector<std::shared_ptr<Operation> > Operations_t;
class TransitionScene
{
public:
- TransitionScene()
- {
- }
-
TransitionScene(
const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 15e3d0a..d05eafd 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -207,10 +207,6 @@ public:
*/
virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const = 0;
- /** Get the number of Redo actions.
- */
- virtual size_t GetRedoActionCount(const bool bCurrentLevel = true) const = 0;
-
/** Return undo/redo info for this view.
*/
virtual void SetView(SwView* pView) = 0;
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c98f143..105cae3 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -235,11 +235,8 @@ public:
bool Contains( const value_type& x ) const;
inline bool Contains( const SwFormat* p ) const;
- void DeleteAndDestroy( int aStartIdx, int aEndIdx );
void DeleteAndDestroyAll( bool keepDefault = false );
- size_t GetPos( const value_type& x ) const;
-
bool newDefault( const value_type& x );
void newDefault( const_iterator const& position );
};
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index c403cb0..5092edd 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -375,7 +375,6 @@ public:
SwCellStyleDescriptor(const std::pair<OUString, SwBoxAutoFormat*>& rCellStyleDesc) : m_rCellStyleDesc(rCellStyleDesc) { }
const OUString& GetName() { return m_rCellStyleDesc.first; }
- SwBoxAutoFormat* GetFormat() { return m_rCellStyleDesc.second; }
};
class SwCellStyleTable
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 64facb5..b7ef5be 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -109,9 +109,6 @@ public:
SwFmDrawPage* GetSvxPage();
// renamed and outlined to detect where it's called
void InvalidateSwDoc(); // {pDoc = 0;}
- SwDoc* GetDoc();
- /// Same as getByIndex(nIndex), except that it also takes a set of formats to ignore, so the method itself doesn't have to generate such a list.
- css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
};
class SwShapeDescriptor_Impl;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index ffc932b..3393d13 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2061,16 +2061,6 @@ SwFrameFormats::rangeFind( const value_type& x ) const
return rangeFind( x->Which(), x->GetName() );
}
-void SwFrameFormats::DeleteAndDestroy(int aStartIdx, int aEndIdx)
-{
- if (aEndIdx < aStartIdx)
- return;
- for (const_iterator it = begin() + aStartIdx;
- it != begin() + aEndIdx; ++it)
- delete *it;
- m_PosIndex.erase( begin() + aStartIdx, begin() + aEndIdx);
-}
-
void SwFrameFormats::DeleteAndDestroyAll( bool keepDefault )
{
if ( empty() )
@@ -2084,12 +2074,6 @@ void SwFrameFormats::DeleteAndDestroyAll( bool keepDefault )
clear();
}
-size_t SwFrameFormats::GetPos( const value_type& x ) const
-{
- const_iterator const it = find( x );
- return it == end() ? SIZE_MAX : it - begin();
-}
-
std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const value_type& x )
{
SAL_WARN_IF(x->m_ffList != nullptr, "sw", "Inserting already assigned item");
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 1c7e332..125bb6e 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -41,11 +41,6 @@ class SwLayoutFrame: public SwFrame
friend SwFrame* SaveContent( SwLayoutFrame *, SwFrame * );
friend void RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling, bool bGrow );
-#ifdef DBG_UTIL
- //removes empty SwSectionFrames from a chain
- friend SwFrame* SwClearDummies( SwFrame* pFrame );
-#endif
-
protected:
virtual void DestroyImpl() override;
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index e89ed14..7aa7bce 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -844,12 +844,6 @@ void SwXDrawPage::InvalidateSwDoc()
pDoc = nullptr;
}
-SwDoc* SwXDrawPage::GetDoc()
-{
- return pDoc;
-}
-
-
namespace
{
class theSwXShapeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXShapeUnoTunnelId > {};
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index b1635c9..daeed3f 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -138,8 +138,6 @@ public:
virtual ~SwNavigationPI() override;
virtual void dispose() override;
- void GotoPage(); // jump to page; bindable function
-
void UpdateListBox();
void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds);
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index f754118..9094088 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -75,23 +75,6 @@ namespace {
namespace sw { namespace sidebar {
-VclPtr<vcl::Window> PagePropertyPanel::Create (
- vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings)
-{
- if (pParent == nullptr)
- throw css::lang::IllegalArgumentException("no parent Window given to PagePropertyPanel::Create", nullptr, 0);
- if ( ! rxFrame.is())
- throw css::lang::IllegalArgumentException("no XFrame given to PagePropertyPanel::Create", nullptr, 1);
- if (pBindings == nullptr)
- throw css::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", nullptr, 2);
-
- return VclPtr<PagePropertyPanel>::Create( pParent,
- rxFrame,
- pBindings);
-}
-
PagePropertyPanel::PagePropertyPanel(
vcl::Window* pParent,
const css::uno::Reference< css::frame::XFrame>& rxFrame,
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index a798c43..a9bded2 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -54,11 +54,6 @@ namespace sw { namespace sidebar {
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- static VclPtr<vcl::Window> Create(
- vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings );
-
// interface of ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 31827ae..9212c07 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -525,16 +525,6 @@ void SwNavigationPI::MakeMark()
m_nAutoMarkIdx = 0;
}
-void SwNavigationPI::GotoPage()
-{
- if (m_pContextWin && m_pContextWin->GetFloatingWindow() && m_pContextWin->GetFloatingWindow()->IsRollUp())
- ZoomIn();
- if(IsGlobalMode())
- ToggleTree();
- UsePage();
- GetPageEdit().GrabFocus();
-}
-
void SwNavigationPI::ZoomOut()
{
if (IsZoomedIn())
diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
index 037e68f..9d4acd1 100644
--- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx
@@ -128,7 +128,6 @@ namespace webdav_ucp
void setAllowedMethods( OUString & aAllowedMethods ) { m_aAllowedMethods = aAllowedMethods; } ;
OUString & getAllowedMethods() { return m_aAllowedMethods; } ;
bool isLockAllowed() const { return ( m_aAllowedMethods.indexOf( "LOCK" ) != -1 ); };
- bool isUnlockAllowed() const { return ( m_aAllowedMethods.indexOf( "UNLOCK" ) != -1 ); };
void setLocked( bool locked = true ) { m_isLocked = locked; } ;
bool isLocked() const { return m_isLocked; };
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 2862bd9..790349d 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -4117,24 +4117,6 @@ void Content::getResourceOptions(
}
-void Content::getResourceOptions(
- const uno::Reference< ucb::XCommandEnvironment >& xEnv,
- DAVOptions& rDAVOptions )
- throw ( uno::Exception, std::exception )
-{
- std::unique_ptr< DAVResourceAccess > xResAccess;
- {
- osl::MutexGuard aGuard( m_aMutex );
- xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
- }
- getResourceOptions( xEnv, rDAVOptions, xResAccess );
- {
- osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
- }
-}
-
-
//static
bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
const std::unique_ptr< DAVResourceAccess > & rResAccess,
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 1e02090..87adc3a 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -323,10 +323,6 @@ public:
const std::unique_ptr< DAVResourceAccess > & rResAccess )
throw ( css::uno::Exception, std::exception );
- void getResourceOptions( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
- DAVOptions& rDAVOptions )
- throw ( css::uno::Exception, std::exception );
-
static bool isResourceAvailable( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
const std::unique_ptr< DAVResourceAccess > & rResAccess,
DAVOptions& rDAVOptions );
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 72b0b15..d10129c 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -82,7 +82,6 @@ public:
bool Create( const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight );
OpenGLTexture& GetTexture() const;
- static rtl::Reference<OpenGLContext> GetBitmapContext();
const BitmapPalette& GetBitmapPalette() const { return maPalette; }
private:
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 7044119..b092473 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -109,7 +109,6 @@ public:
void GetCoord( GLfloat* pCoord, const SalTwoRect& rPosAry, bool bInverted=false ) const;
void GetWholeCoord( GLfloat* pCoord ) const;
- OpenGLTexture GetWholeTexture();
void Bind();
void Unbind();
void Read( GLenum nFormat, GLenum nType, sal_uInt8* pData );
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index af93401..fde9f19 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -737,11 +737,6 @@ void OpenGLSalBitmap::updateChecksum() const
SalBitmap::updateChecksum();
}
-rtl::Reference<OpenGLContext> OpenGLSalBitmap::GetBitmapContext()
-{
- return ImplGetDefaultWindow()->GetGraphics()->GetOpenGLContext();
-}
-
BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
{
OpenGLVCLContextZone aContextZone;
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 03055c4..dd358aa 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -461,13 +461,6 @@ void OpenGLTexture::GetWholeCoord( GLfloat* pCoord ) const
}
}
-OpenGLTexture OpenGLTexture::GetWholeTexture()
-{
- if (IsValid())
- return OpenGLTexture(mpImpl, Rectangle(Point(0, 0), Size(mpImpl->mnWidth, mpImpl->mnHeight)), -1);
- return OpenGLTexture();
-}
-
GLenum OpenGLTexture::GetFilter() const
{
if( mpImpl )
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 33f0aa9..8a0678f 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -370,13 +370,6 @@ OUString FilterConfigCache::GetImportFormatName( sal_uInt16 nFormat )
return OUString("");
}
-OUString FilterConfigCache::GetImportFormatMediaType( sal_uInt16 nFormat )
-{
- if( nFormat < aImport.size() )
- return aImport[ nFormat ].sMediaType;
- return OUString("");
-}
-
OUString FilterConfigCache::GetImportFormatShortName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index eb32218..0a6c537 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -86,7 +86,6 @@ public:
OUString GetImportFilterName( sal_uInt16 nFormat );
OUString GetImportFormatName( sal_uInt16 nFormat );
OUString GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
- OUString GetImportFormatMediaType( sal_uInt16 nFormat );
OUString GetImportFormatShortName( sal_uInt16 nFormat );
OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
OUString GetImportFilterType( sal_uInt16 nFormat );
More information about the Libreoffice-commits
mailing list