sd/inc/Outliner.hxx | 15
sd/source/core/sdpage.cxx | 76 +-
sd/source/filter/eppt/eppt.cxx | 1
sd/source/filter/eppt/eppt.hxx | 5
sd/source/filter/eppt/epptbase.hxx | 5
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 27
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 3
sd/source/ui/controller/slidelayoutcontroller.cxx | 55 -
sd/source/ui/dlg/NavigatorChildWindow.cxx | 2
sd/source/ui/dlg/TemplateScanner.cxx | 7
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/prntopts.cxx | 3
sd/source/ui/framework/configuration/ConfigurationController.cxx | 3
sd/source/ui/inc/AccessibleViewForwarder.hxx | 1
sd/source/ui/inc/EventMultiplexer.hxx | 2
sd/source/ui/inc/GraphicObjectBar.hxx | 1
sd/source/ui/inc/MasterPageObserver.hxx | 3
sd/source/ui/inc/OutlineView.hxx | 1
sd/source/ui/inc/Ruler.hxx | 1
sd/source/ui/inc/SlideSorter.hxx | 1
sd/source/ui/inc/TemplateScanner.hxx | 5
sd/source/ui/inc/View.hxx | 1
sd/source/ui/inc/Window.hxx | 1
sd/source/ui/inc/docprev.hxx | 1
sd/source/ui/inc/navigatr.hxx | 2
sd/source/ui/inc/prntopts.hxx | 2
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5
sd/source/ui/sidebar/MasterPageObserver.cxx | 3
sd/source/ui/sidebar/MasterPagesSelector.cxx | 1
sd/source/ui/sidebar/MasterPagesSelector.hxx | 1
sd/source/ui/sidebar/NavigatorWrapper.cxx | 1
sd/source/ui/slideshow/slideshowimpl.cxx | 12
sd/source/ui/slideshow/slideshowimpl.hxx | 13
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 6
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 2
sd/source/ui/tools/EventMultiplexer.cxx | 11
sd/source/ui/unoidl/unoobj.cxx | 11
sd/source/ui/view/GraphicObjectBar.cxx | 5
sd/source/ui/view/Outliner.cxx | 3
sd/source/ui/view/drviews1.cxx | 4
sd/source/ui/view/outlview.cxx | 11
sd/source/ui/view/sdruler.cxx | 1
sd/source/ui/view/sdview2.cxx | 18
sd/source/ui/view/sdwindow.cxx | 1
sd/source/ui/view/viewshe2.cxx | 4
sdext/source/minimizer/fileopendialog.hxx | 1
sdext/source/presenter/PresenterSlideSorter.cxx | 2
sdext/source/presenter/PresenterTheme.cxx | 1
sfx2/source/appl/appdata.cxx | 7
sfx2/source/appl/sfxpicklist.cxx | 2
sfx2/source/control/bindings.cxx | 12
sfx2/source/control/dispatch.cxx | 1
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/doc/docfac.cxx | 7
sfx2/source/doc/docfile.cxx | 18
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/appdata.hxx | 9
sfx2/source/inc/objshimp.hxx | 6
sfx2/source/inc/sfxpicklist.hxx | 6
sfx2/source/inc/templdgi.hxx | 3
sfx2/source/inc/workwin.hxx | 9
sfx2/source/view/frame.cxx | 2
sfx2/source/view/impframe.hxx | 6
shell/inc/internal/xml_parser.hxx | 16
shell/source/all/xml_parser.cxx | 6
slideshow/source/engine/activities/activitiesfactory.cxx | 9
soltools/mkdepend/def.h | 1
sot/source/sdstor/ucbstorage.cxx | 4
store/source/storbios.hxx | 4
svl/source/misc/inettype.cxx | 359
++++------
svtools/source/contnr/contentenumeration.hxx | 13
svtools/source/control/valueacc.cxx | 1
svtools/source/control/valueimp.hxx | 1
svtools/source/toolpanel/tablayouter.cxx | 2
svx/inc/galobj.hxx | 1
svx/source/accessibility/AccessibleTextHelper.cxx | 7
svx/source/dialog/imapwnd.hxx | 2
svx/source/form/tabwin.cxx | 8
svx/source/svdraw/svdocirc.cxx | 6
svx/source/table/svdotable.cxx | 2
svx/source/table/tablertfimporter.cxx | 6
svx/source/table/tableundo.hxx | 1
86 files changed, 303 insertions(+), 590 deletions(-)
New commits:
commit 0cda1453a0e24e9ad6884a1345e4514a86900346
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 13:20:10 2015 +0200
loplugin:unusedfields in svx/
Change-Id: Ia6531b1ff8882ad06084f11dd10e2b1fe3c8cf24
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 77cfb6e..8398a7d 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -53,7 +53,6 @@ protected:
BitmapEx aThumbBmp; // Allow transparence to survive
GDIMetaFile aThumbMtf;
INetURLObject aURL;
- OUString aUserName;
OUString aTitle;
bool bIsValid;
bool bIsThumbBmp;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index d7e6730..03570b0 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -848,7 +848,7 @@ namespace accessibility
::accessibility::AccessibleParaManager::WeakChild >
{
public:
- explicit AccessibleTextHelper_UpdateChildBounds(
AccessibleTextHelper_Impl& rImpl ) : mrImpl(rImpl) {}
+ explicit AccessibleTextHelper_UpdateChildBounds() {}
::accessibility::AccessibleParaManager::WeakChild operator()( const
::accessibility::AccessibleParaManager::WeakChild& rChild )
{
// retrieve hard reference from weak one
@@ -875,15 +875,12 @@ namespace accessibility
// identity transform
return rChild;
}
-
- private:
- AccessibleTextHelper_Impl& mrImpl;
};
void AccessibleTextHelper_Impl::UpdateBoundRect()
{
// send BOUNDRECT_CHANGED to affected children
- AccessibleTextHelper_UpdateChildBounds aFunctor( *this );
+ AccessibleTextHelper_UpdateChildBounds aFunctor;
::std::transform( maParaManager.begin(), maParaManager.end(),
maParaManager.begin(), aFunctor );
}
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 5e8afcc..e405570 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -47,8 +47,6 @@ struct NotifyPosSize
{
Size aPictureSize;
Point aMousePos;
- bool bPictureSize;
- bool bMousePos;
};
#define SVD_IMAP_USERDATA 0x0001
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index ed8052e..bc3ee57 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -76,10 +76,8 @@ namespace {
struct ColumnInfo
{
OUString sColumnName;
- OUString sLabel;
- ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel)
+ ColumnInfo(const OUString& i_sColumnName)
: sColumnName(i_sColumnName)
- , sLabel(i_sLabel)
{
}
};
@@ -98,9 +96,9 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const
uno::Reference< conta
if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
if ( !sLabel.isEmpty() )
- _rListBox.InsertEntry( sLabel, nullptr, false, TREELIST_APPEND,
new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( sLabel, nullptr, false, TREELIST_APPEND,
new ColumnInfo(*pEntries) );
else
- _rListBox.InsertEntry( *pEntries, nullptr, false, TREELIST_APPEND,
new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( *pEntries, nullptr, false, TREELIST_APPEND,
new ColumnInfo(*pEntries) );
}
}
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index eee1101..0ceaab1 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -363,8 +363,6 @@ struct ImpCircUser : public SdrDragStatUserData
long nWdt;
long nStart;
long nEnd;
- long nAngle;
- bool bRight; // not yet implemented
public:
ImpCircUser()
@@ -372,9 +370,7 @@ public:
nHgt(0),
nWdt(0),
nStart(0),
- nEnd(0),
- nAngle(0),
- bRight(false)
+ nEnd(0)
{}
void SetCreateParams(SdrDragStat& rStat);
};
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 71b0b5a..15bbb7f 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -205,7 +205,6 @@ public:
CellPos maEditPos;
TableStyleSettings maTableStyle;
Reference< XIndexAccess > mxTableStyle;
- bool mbModifyPending;
void SetModel(SdrModel* pOldModel, SdrModel* pNewModel);
@@ -262,7 +261,6 @@ sal_Int32 SdrTableObjImpl::lastColCount;
SdrTableObjImpl::SdrTableObjImpl()
: mpTableObj( nullptr )
, mpLayouter( nullptr )
-, mbModifyPending( false )
{
}
diff --git a/svx/source/table/tablertfimporter.cxx
b/svx/source/table/tablertfimporter.cxx
index 3eb66b7..a2237c4 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -51,10 +51,9 @@ struct RTFCellDefault
{
SfxItemSet maItemSet;
sal_Int32 mnCol;
- sal_uInt16 mnTwips; // right border of the cell
sal_Int32 mnColSpan; // MergeCell if >1, merged cells if 0
- explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ),
mnCol(0), mnTwips(0 ), mnColSpan(1) {}
+ explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ),
mnCol(0), mnColSpan(1) {}
};
typedef std::vector< std::shared_ptr< RTFCellDefault > > RTFCellDefaultVector;
@@ -64,9 +63,8 @@ struct RTFCellInfo
SfxItemSet maItemSet;
sal_Int32 mnStartPara;
sal_Int32 mnParaCount;
- sal_Int32 mnColSpan;
- explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ),
mnStartPara(0), mnParaCount(0), mnColSpan(0) {}
+ explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ),
mnStartPara(0), mnParaCount(0) {}
};
typedef std::shared_ptr< RTFCellInfo > RTFCellInfoPtr;
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 63a8ed6..dca50c8 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -221,7 +221,6 @@ public:
private:
struct Data
{
- CellVector maCells;
sal_Int32 mnRow;
sal_Int32 mnHeight;
bool mbOptimalHeight;
commit e2c03fde5807b9a3a57321ff9396c3dd76ab4dcf
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 13:11:05 2015 +0200
loplugin:unusedfields svtools/
Change-Id: Ibab9bab1e36dd6bb938c2977d143d40a287bf4ab
diff --git a/svtools/source/contnr/contentenumeration.hxx
b/svtools/source/contnr/contentenumeration.hxx
index 8c63ef9..4484482 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -39,16 +39,15 @@ namespace svt
struct SortingData_Impl
{
private:
- OUString maFilename; // only filename in upper case - for compare
purposes
- OUString maTitle; // -> be careful when changing maTitle to
update maFilename only when new
- OUString maLowerTitle;
+ OUString maFilename; // only filename in upper case - for
compare purposes
+ OUString maTitle; // -> be careful when changing maTitle to
update maFilename only when new
+ OUString maLowerTitle;
public:
- OUString maType;
- OUString maTargetURL;
- OUString maImageURL;
- OUString maDisplayText;
+ OUString maType;
+ OUString maTargetURL;
+ OUString maDisplayText;
DateTime maModDate;
Image maImage;
sal_Int64 maSize;
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index 24c3b27e..6654836 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -41,7 +41,6 @@ ValueSetItem::ValueSetItem( ValueSet& rParent )
, meType(VALUESETITEM_NONE)
, mbVisible(true)
, mpData(nullptr)
- , mbSelected(false)
, mxAcc()
{
}
diff --git a/svtools/source/control/valueimp.hxx
b/svtools/source/control/valueimp.hxx
index 93c1ae4..5599c77 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -59,7 +59,6 @@ struct ValueSetItem
Color maColor;
OUString maText;
void* mpData;
- bool mbSelected;
css::uno::Reference< css::accessibility::XAccessible > mxAcc;
explicit ValueSetItem( ValueSet& rParent );
diff --git a/svtools/source/toolpanel/tablayouter.cxx
b/svtools/source/toolpanel/tablayouter.cxx
index 9c1a866..6a4e474 100644
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -40,14 +40,12 @@ namespace svt
struct TabDeckLayouter_Data
{
TabAlignment eAlignment;
- IToolPanelDeck& rPanels;
VclPtr< PanelTabBar > pTabBar;
AccessibleFactoryAccess aAccessibleFactory;
TabDeckLayouter_Data( vcl::Window& i_rParent, IToolPanelDeck&
i_rPanels,
const TabAlignment i_eAlignment, const TabItemContent
i_eItemContent )
:eAlignment( i_eAlignment )
- ,rPanels( i_rPanels )
,pTabBar( VclPtr<PanelTabBar>::Create( i_rParent, i_rPanels,
i_eAlignment, i_eItemContent ) )
{
pTabBar->Show();
commit 32303d062058f937b69ffffe753e4fc24e2f436b
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 13:05:55 2015 +0200
loplugin:unusedfields in svl/
Change-Id: Iae589bc1e0333c8e4cf89a3d061ba10094874520
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 1f51d09..fbf6180 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -38,7 +38,6 @@ struct MediaTypeEntry
{
sal_Char const * m_pTypeName;
INetContentType m_eTypeID;
- sal_Char const * m_pExtension;
};
struct TypeIDMapEntry
@@ -127,119 +126,91 @@ MediaTypeEntry const * seekEntry(OUString const &
rTypeName,
name.
*/
MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
- = { { " ", CONTENT_TYPE_UNKNOWN, "" },
- { CONTENT_TYPE_STR_X_CNT_FSYSBOX, CONTENT_TYPE_X_CNT_FSYSBOX, "tmp" },
- { CONTENT_TYPE_STR_X_CNT_FSYSFOLDER, CONTENT_TYPE_X_CNT_FSYSFOLDER,
- "tmp" },
- { CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER,
- CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER, "tmp" },
- { CONTENT_TYPE_STR_APP_OCTSTREAM, CONTENT_TYPE_APP_OCTSTREAM, "tmp" },
- { CONTENT_TYPE_STR_APP_PDF, CONTENT_TYPE_APP_PDF, "pdf" },
- { CONTENT_TYPE_STR_APP_RTF, CONTENT_TYPE_APP_RTF, "rtf" },
- { CONTENT_TYPE_STR_APP_VND_CALC, CONTENT_TYPE_APP_VND_CALC, "sdc" },
- { CONTENT_TYPE_STR_APP_VND_CHART, CONTENT_TYPE_APP_VND_CHART, "sds" },
- { CONTENT_TYPE_STR_APP_VND_DRAW, CONTENT_TYPE_APP_VND_DRAW, "sda" },
- { CONTENT_TYPE_STR_APP_VND_IMAGE, CONTENT_TYPE_APP_VND_IMAGE, "sim" },
- { CONTENT_TYPE_STR_APP_VND_IMPRESS, CONTENT_TYPE_APP_VND_IMPRESS,
- "sdd" },
- { CONTENT_TYPE_STR_APP_VND_IMPRESSPACKED,
- CONTENT_TYPE_APP_VND_IMPRESSPACKED, "sdp" },
- { CONTENT_TYPE_STR_APP_VND_MAIL, CONTENT_TYPE_APP_VND_MAIL, "sdm" },
- { CONTENT_TYPE_STR_APP_VND_MATH, CONTENT_TYPE_APP_VND_MATH, "smf" },
- { CONTENT_TYPE_STR_APP_VND_NEWS, CONTENT_TYPE_APP_VND_NEWS, "sdm" },
- { CONTENT_TYPE_STR_APP_VND_OUTTRAY, CONTENT_TYPE_APP_VND_OUTTRAY,
- "sdm" },
- { CONTENT_TYPE_STR_APP_VND_TEMPLATE, CONTENT_TYPE_APP_VND_TEMPLATE,
- "vor" },
- { CONTENT_TYPE_STR_APP_VND_WRITER, CONTENT_TYPE_APP_VND_WRITER,
- "sdw" },
- { CONTENT_TYPE_STR_APP_VND_WRITER_GLOBAL,
- CONTENT_TYPE_APP_VND_WRITER_GLOBAL, "sgl" },
- { CONTENT_TYPE_STR_APP_VND_WRITER_WEB,
- CONTENT_TYPE_APP_VND_WRITER_WEB, "htm" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_CALC,
CONTENT_TYPE_APP_VND_SUN_XML_CALC, "sxc" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_CHART,
CONTENT_TYPE_APP_VND_SUN_XML_CHART, "sxs" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_DRAW,
CONTENT_TYPE_APP_VND_SUN_XML_DRAW, "sxd" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESS,
CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS, "sxi" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED,
CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED, "sxp" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_MATH,
CONTENT_TYPE_APP_VND_SUN_XML_MATH, "sxm" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER,
CONTENT_TYPE_APP_VND_SUN_XML_WRITER, "sxw" },
- { CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL,
CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL, "sxg" },
- { CONTENT_TYPE_STR_APP_FRAMESET, CONTENT_TYPE_APP_FRAMESET, "sfs" },
- { CONTENT_TYPE_STR_APP_GALLERY, CONTENT_TYPE_APP_GALLERY, "gal" },
- { CONTENT_TYPE_STR_APP_GALLERY_THEME, CONTENT_TYPE_APP_GALLERY_THEME,
- "thm" },
- { CONTENT_TYPE_STR_APP_JAR, CONTENT_TYPE_APP_JAR, "jar" },
- { CONTENT_TYPE_STR_APP_MACRO, CONTENT_TYPE_APP_MACRO, "tmp" },
- { CONTENT_TYPE_STR_APP_MSEXCEL, CONTENT_TYPE_APP_MSEXCEL, "xls" },
- { CONTENT_TYPE_STR_APP_MSEXCEL_TEMPL, CONTENT_TYPE_APP_MSEXCEL_TEMPL,
- "xlt" },
- { CONTENT_TYPE_STR_APP_MSPPOINT, CONTENT_TYPE_APP_MSPPOINT, "ppt" },
- { CONTENT_TYPE_STR_APP_MSPPOINT_TEMPL,
- CONTENT_TYPE_APP_MSPPOINT_TEMPL, "pot" },
- { CONTENT_TYPE_STR_APP_MSWORD, CONTENT_TYPE_APP_MSWORD, "doc" },
- { CONTENT_TYPE_STR_APP_MSWORD_TEMPL, CONTENT_TYPE_APP_MSWORD_TEMPL,
- "dot" },
- { CONTENT_TYPE_STR_APP_STARCALC, CONTENT_TYPE_APP_STARCALC, "sdc" },
- { CONTENT_TYPE_STR_APP_STARCHART, CONTENT_TYPE_APP_STARCHART, "sds" },
- { CONTENT_TYPE_STR_APP_STARDRAW, CONTENT_TYPE_APP_STARDRAW, "sda" },
- { CONTENT_TYPE_STR_APP_STARHELP, CONTENT_TYPE_APP_STARHELP, "svh" },
- { CONTENT_TYPE_STR_APP_STARIMAGE, CONTENT_TYPE_APP_STARIMAGE, "sim" },
- { CONTENT_TYPE_STR_APP_STARIMPRESS, CONTENT_TYPE_APP_STARIMPRESS,
- "sdd" },
- { CONTENT_TYPE_STR_APP_STARMAIL_SDM, CONTENT_TYPE_APP_STARMAIL_SDM,
- "sdm" },
- { CONTENT_TYPE_STR_APP_STARMAIL_SMD, CONTENT_TYPE_APP_STARMAIL_SMD,
- "smd" },
- { CONTENT_TYPE_STR_APP_STARMATH, CONTENT_TYPE_APP_STARMATH, "smf" },
- { CONTENT_TYPE_STR_APP_STARWRITER, CONTENT_TYPE_APP_STARWRITER,
- "sdw" },
- { CONTENT_TYPE_STR_APP_STARWRITER_GLOB,
- CONTENT_TYPE_APP_STARWRITER_GLOB, "sgl" },
- { CONTENT_TYPE_STR_APP_CDE_CALENDAR_APP,
- CONTENT_TYPE_APP_CDE_CALENDAR_APP, "appt" },
- { CONTENT_TYPE_STR_APP_ZIP, CONTENT_TYPE_APP_ZIP, "zip" },
- { CONTENT_TYPE_STR_AUDIO_AIFF, CONTENT_TYPE_AUDIO_AIFF, "aif" },
- { CONTENT_TYPE_STR_AUDIO_BASIC, CONTENT_TYPE_AUDIO_BASIC, "au" },
- { CONTENT_TYPE_STR_AUDIO_MIDI, CONTENT_TYPE_AUDIO_MIDI, "mid" },
- { CONTENT_TYPE_STR_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_VORBIS, "ogg" },
- { CONTENT_TYPE_STR_AUDIO_WAV, CONTENT_TYPE_AUDIO_WAV, "wav" },
- { CONTENT_TYPE_STR_AUDIO_WEBM, CONTENT_TYPE_AUDIO_WEBM, "webm" },
- { CONTENT_TYPE_STR_IMAGE_GENERIC, CONTENT_TYPE_IMAGE_GENERIC, "tmp" },
- { CONTENT_TYPE_STR_IMAGE_GIF, CONTENT_TYPE_IMAGE_GIF, "gif" },
- { CONTENT_TYPE_STR_IMAGE_JPEG, CONTENT_TYPE_IMAGE_JPEG, "jpg" },
- { CONTENT_TYPE_STR_IMAGE_PCX, CONTENT_TYPE_IMAGE_PCX, "pcx" },
- { CONTENT_TYPE_STR_IMAGE_PNG, CONTENT_TYPE_IMAGE_PNG, "png" },
- { CONTENT_TYPE_STR_IMAGE_TIFF, CONTENT_TYPE_IMAGE_TIFF, "tif" },
- { CONTENT_TYPE_STR_IMAGE_BMP, CONTENT_TYPE_IMAGE_BMP, "bmp" },
- { CONTENT_TYPE_STR_INET_MSG_RFC822, CONTENT_TYPE_INET_MESSAGE_RFC822,
- "tmp" },
- { CONTENT_TYPE_STR_INET_MULTI_ALTERNATIVE,
- CONTENT_TYPE_INET_MULTIPART_ALTERNATIVE, "tmp" },
- { CONTENT_TYPE_STR_INET_MULTI_DIGEST,
- CONTENT_TYPE_INET_MULTIPART_DIGEST, "tmp" },
- { CONTENT_TYPE_STR_INET_MULTI_MIXED,
- CONTENT_TYPE_INET_MULTIPART_MIXED, "tmp" },
- { CONTENT_TYPE_STR_INET_MULTI_PARALLEL,
- CONTENT_TYPE_INET_MULTIPART_PARALLEL, "tmp" },
- { CONTENT_TYPE_STR_INET_MULTI_RELATED,
- CONTENT_TYPE_INET_MULTIPART_RELATED, "tmp" },
- { CONTENT_TYPE_STR_TEXT_ICALENDAR, CONTENT_TYPE_TEXT_ICALENDAR,
- "ics" },
- { CONTENT_TYPE_STR_TEXT_HTML, CONTENT_TYPE_TEXT_HTML, "htm" },
- { CONTENT_TYPE_STR_TEXT_PLAIN, CONTENT_TYPE_TEXT_PLAIN, "txt" },
- { CONTENT_TYPE_STR_TEXT_XMLICALENDAR, CONTENT_TYPE_TEXT_XMLICALENDAR,
- "xcs" },
- { CONTENT_TYPE_STR_TEXT_URL, CONTENT_TYPE_TEXT_URL, "url" },
- { CONTENT_TYPE_STR_TEXT_VCALENDAR, CONTENT_TYPE_TEXT_VCALENDAR,
- "vcs" },
- { CONTENT_TYPE_STR_TEXT_VCARD, CONTENT_TYPE_TEXT_VCARD, "vcf" },
- { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO, "avi" },
- { CONTENT_TYPE_STR_VIDEO_THEORA, CONTENT_TYPE_VIDEO_THEORA, "ogg" },
- { CONTENT_TYPE_STR_VIDEO_VDO, CONTENT_TYPE_VIDEO_VDO, "vdo" },
- { CONTENT_TYPE_STR_VIDEO_WEBM, CONTENT_TYPE_VIDEO_WEBM, "webm" },
- { CONTENT_TYPE_STR_X_STARMAIL, CONTENT_TYPE_X_STARMAIL, "smd" },
- { CONTENT_TYPE_STR_X_VRML, CONTENT_TYPE_X_VRML, "wrl" }
+ = { { " ", CONTENT_TYPE_UNKNOWN },
+ { CONTENT_TYPE_STR_X_CNT_FSYSBOX, CONTENT_TYPE_X_CNT_FSYSBOX },
+ { CONTENT_TYPE_STR_X_CNT_FSYSFOLDER, CONTENT_TYPE_X_CNT_FSYSFOLDER },
+ { CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER,
CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER },
+ { CONTENT_TYPE_STR_APP_OCTSTREAM, CONTENT_TYPE_APP_OCTSTREAM },
+ { CONTENT_TYPE_STR_APP_PDF, CONTENT_TYPE_APP_PDF },
+ { CONTENT_TYPE_STR_APP_RTF, CONTENT_TYPE_APP_RTF },
+ { CONTENT_TYPE_STR_APP_VND_CALC, CONTENT_TYPE_APP_VND_CALC },
+ { CONTENT_TYPE_STR_APP_VND_CHART, CONTENT_TYPE_APP_VND_CHART },
+ { CONTENT_TYPE_STR_APP_VND_DRAW, CONTENT_TYPE_APP_VND_DRAW },
+ { CONTENT_TYPE_STR_APP_VND_IMAGE, CONTENT_TYPE_APP_VND_IMAGE },
+ { CONTENT_TYPE_STR_APP_VND_IMPRESS, CONTENT_TYPE_APP_VND_IMPRESS },
+ { CONTENT_TYPE_STR_APP_VND_IMPRESSPACKED,
CONTENT_TYPE_APP_VND_IMPRESSPACKED },
+ { CONTENT_TYPE_STR_APP_VND_MAIL, CONTENT_TYPE_APP_VND_MAIL },
+ { CONTENT_TYPE_STR_APP_VND_MATH, CONTENT_TYPE_APP_VND_MATH },
+ { CONTENT_TYPE_STR_APP_VND_NEWS, CONTENT_TYPE_APP_VND_NEWS },
+ { CONTENT_TYPE_STR_APP_VND_OUTTRAY, CONTENT_TYPE_APP_VND_OUTTRAY },
+ { CONTENT_TYPE_STR_APP_VND_TEMPLATE, CONTENT_TYPE_APP_VND_TEMPLATE },
+ { CONTENT_TYPE_STR_APP_VND_WRITER, CONTENT_TYPE_APP_VND_WRITER },
+ { CONTENT_TYPE_STR_APP_VND_WRITER_GLOBAL,
CONTENT_TYPE_APP_VND_WRITER_GLOBAL },
+ { CONTENT_TYPE_STR_APP_VND_WRITER_WEB, CONTENT_TYPE_APP_VND_WRITER_WEB
},
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_CALC,
CONTENT_TYPE_APP_VND_SUN_XML_CALC },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_CHART,
CONTENT_TYPE_APP_VND_SUN_XML_CHART },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_DRAW,
CONTENT_TYPE_APP_VND_SUN_XML_DRAW },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESS,
CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED,
CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_MATH,
CONTENT_TYPE_APP_VND_SUN_XML_MATH },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER,
CONTENT_TYPE_APP_VND_SUN_XML_WRITER },
+ { CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL,
CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL },
+ { CONTENT_TYPE_STR_APP_FRAMESET, CONTENT_TYPE_APP_FRAMESET },
+ { CONTENT_TYPE_STR_APP_GALLERY, CONTENT_TYPE_APP_GALLERY },
+ { CONTENT_TYPE_STR_APP_GALLERY_THEME, CONTENT_TYPE_APP_GALLERY_THEME },
+ { CONTENT_TYPE_STR_APP_JAR, CONTENT_TYPE_APP_JAR },
+ { CONTENT_TYPE_STR_APP_MACRO, CONTENT_TYPE_APP_MACRO },
+ { CONTENT_TYPE_STR_APP_MSEXCEL, CONTENT_TYPE_APP_MSEXCEL },
+ { CONTENT_TYPE_STR_APP_MSEXCEL_TEMPL, CONTENT_TYPE_APP_MSEXCEL_TEMPL },
+ { CONTENT_TYPE_STR_APP_MSPPOINT, CONTENT_TYPE_APP_MSPPOINT },
+ { CONTENT_TYPE_STR_APP_MSPPOINT_TEMPL, CONTENT_TYPE_APP_MSPPOINT_TEMPL
},
+ { CONTENT_TYPE_STR_APP_MSWORD, CONTENT_TYPE_APP_MSWORD },
+ { CONTENT_TYPE_STR_APP_MSWORD_TEMPL, CONTENT_TYPE_APP_MSWORD_TEMPL },
+ { CONTENT_TYPE_STR_APP_STARCALC, CONTENT_TYPE_APP_STARCALC },
+ { CONTENT_TYPE_STR_APP_STARCHART, CONTENT_TYPE_APP_STARCHART },
+ { CONTENT_TYPE_STR_APP_STARDRAW, CONTENT_TYPE_APP_STARDRAW },
+ { CONTENT_TYPE_STR_APP_STARHELP, CONTENT_TYPE_APP_STARHELP },
+ { CONTENT_TYPE_STR_APP_STARIMAGE, CONTENT_TYPE_APP_STARIMAGE },
+ { CONTENT_TYPE_STR_APP_STARIMPRESS, CONTENT_TYPE_APP_STARIMPRESS },
+ { CONTENT_TYPE_STR_APP_STARMAIL_SDM, CONTENT_TYPE_APP_STARMAIL_SDM },
+ { CONTENT_TYPE_STR_APP_STARMAIL_SMD, CONTENT_TYPE_APP_STARMAIL_SMD },
+ { CONTENT_TYPE_STR_APP_STARMATH, CONTENT_TYPE_APP_STARMATH },
+ { CONTENT_TYPE_STR_APP_STARWRITER, CONTENT_TYPE_APP_STARWRITER },
+ { CONTENT_TYPE_STR_APP_STARWRITER_GLOB,
CONTENT_TYPE_APP_STARWRITER_GLOB },
+ { CONTENT_TYPE_STR_APP_CDE_CALENDAR_APP,
CONTENT_TYPE_APP_CDE_CALENDAR_APP },
+ { CONTENT_TYPE_STR_APP_ZIP, CONTENT_TYPE_APP_ZIP },
+ { CONTENT_TYPE_STR_AUDIO_AIFF, CONTENT_TYPE_AUDIO_AIFF },
+ { CONTENT_TYPE_STR_AUDIO_BASIC, CONTENT_TYPE_AUDIO_BASIC },
+ { CONTENT_TYPE_STR_AUDIO_MIDI, CONTENT_TYPE_AUDIO_MIDI },
+ { CONTENT_TYPE_STR_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_VORBIS },
+ { CONTENT_TYPE_STR_AUDIO_WAV, CONTENT_TYPE_AUDIO_WAV },
+ { CONTENT_TYPE_STR_AUDIO_WEBM, CONTENT_TYPE_AUDIO_WEBM },
+ { CONTENT_TYPE_STR_IMAGE_GENERIC, CONTENT_TYPE_IMAGE_GENERIC },
+ { CONTENT_TYPE_STR_IMAGE_GIF, CONTENT_TYPE_IMAGE_GIF },
+ { CONTENT_TYPE_STR_IMAGE_JPEG, CONTENT_TYPE_IMAGE_JPEG },
+ { CONTENT_TYPE_STR_IMAGE_PCX, CONTENT_TYPE_IMAGE_PCX },
+ { CONTENT_TYPE_STR_IMAGE_PNG, CONTENT_TYPE_IMAGE_PNG },
+ { CONTENT_TYPE_STR_IMAGE_TIFF, CONTENT_TYPE_IMAGE_TIFF },
+ { CONTENT_TYPE_STR_IMAGE_BMP, CONTENT_TYPE_IMAGE_BMP },
+ { CONTENT_TYPE_STR_INET_MSG_RFC822, CONTENT_TYPE_INET_MESSAGE_RFC822 },
+ { CONTENT_TYPE_STR_INET_MULTI_ALTERNATIVE,
CONTENT_TYPE_INET_MULTIPART_ALTERNATIVE },
+ { CONTENT_TYPE_STR_INET_MULTI_DIGEST,
CONTENT_TYPE_INET_MULTIPART_DIGEST },
+ { CONTENT_TYPE_STR_INET_MULTI_MIXED, CONTENT_TYPE_INET_MULTIPART_MIXED
},
+ { CONTENT_TYPE_STR_INET_MULTI_PARALLEL,
CONTENT_TYPE_INET_MULTIPART_PARALLEL },
+ { CONTENT_TYPE_STR_INET_MULTI_RELATED,
CONTENT_TYPE_INET_MULTIPART_RELATED },
+ { CONTENT_TYPE_STR_TEXT_ICALENDAR, CONTENT_TYPE_TEXT_ICALENDAR },
+ { CONTENT_TYPE_STR_TEXT_HTML, CONTENT_TYPE_TEXT_HTML },
+ { CONTENT_TYPE_STR_TEXT_PLAIN, CONTENT_TYPE_TEXT_PLAIN },
+ { CONTENT_TYPE_STR_TEXT_XMLICALENDAR, CONTENT_TYPE_TEXT_XMLICALENDAR },
+ { CONTENT_TYPE_STR_TEXT_URL, CONTENT_TYPE_TEXT_URL },
+ { CONTENT_TYPE_STR_TEXT_VCALENDAR, CONTENT_TYPE_TEXT_VCALENDAR },
+ { CONTENT_TYPE_STR_TEXT_VCARD, CONTENT_TYPE_TEXT_VCARD },
+ { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO },
+ { CONTENT_TYPE_STR_VIDEO_THEORA, CONTENT_TYPE_VIDEO_THEORA },
+ { CONTENT_TYPE_STR_VIDEO_VDO, CONTENT_TYPE_VIDEO_VDO },
+ { CONTENT_TYPE_STR_VIDEO_WEBM, CONTENT_TYPE_VIDEO_WEBM },
+ { CONTENT_TYPE_STR_X_STARMAIL, CONTENT_TYPE_X_STARMAIL },
+ { CONTENT_TYPE_STR_X_VRML, CONTENT_TYPE_X_VRML }
};
/** A mapping from type IDs to presentation resource IDs. Sorted by type ID.
@@ -343,86 +314,86 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST +
1]
/** A mapping from extensions to type IDs. Sorted by extension.
*/
MediaTypeEntry const aStaticExtensionMap[]
- = { { "aif", CONTENT_TYPE_AUDIO_AIFF, "" },
- { "aiff", CONTENT_TYPE_AUDIO_AIFF, "" },
- { "appt", CONTENT_TYPE_APP_CDE_CALENDAR_APP, "" },
- { "au", CONTENT_TYPE_AUDIO_BASIC, "" },
- { "avi", CONTENT_TYPE_VIDEO_MSVIDEO, "" },
- { "bmp", CONTENT_TYPE_IMAGE_BMP, "" },
- { "cgm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "doc", CONTENT_TYPE_APP_MSWORD, "" },
- { "dot", CONTENT_TYPE_APP_MSWORD_TEMPL, "" },
- { "dxf", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "eps", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "gal", CONTENT_TYPE_APP_GALLERY, "" },
- { "gif", CONTENT_TYPE_IMAGE_GIF, "" },
- { "htm", CONTENT_TYPE_TEXT_HTML, "" },
- { "html", CONTENT_TYPE_TEXT_HTML, "" },
- { "ics", CONTENT_TYPE_TEXT_ICALENDAR, "" },
- { "jar", CONTENT_TYPE_APP_JAR, "" },
- { "jpeg", CONTENT_TYPE_IMAGE_JPEG, "" },
- { "jpg", CONTENT_TYPE_IMAGE_JPEG, "" },
- { "met", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "mid", CONTENT_TYPE_AUDIO_MIDI, "" },
- { "midi", CONTENT_TYPE_AUDIO_MIDI, "" },
- { "ogg", CONTENT_TYPE_AUDIO_VORBIS, "" },
- { "pbm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "pcd", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "pct", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "pcx", CONTENT_TYPE_IMAGE_PCX, "" },
- { "pdf", CONTENT_TYPE_APP_PDF, "" },
- { "pgm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "png", CONTENT_TYPE_IMAGE_PNG, "" },
- { "pot", CONTENT_TYPE_APP_MSPPOINT_TEMPL, "" },
- { "ppm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "ppt", CONTENT_TYPE_APP_MSPPOINT, "" },
- { "psd", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "ras", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "rtf", CONTENT_TYPE_APP_RTF, "" },
- { "sda", CONTENT_TYPE_APP_VND_DRAW, "" },
- { "sdc", CONTENT_TYPE_APP_VND_CALC, "" },
- { "sdd", CONTENT_TYPE_APP_VND_IMPRESS, "" },
- { "sdm", CONTENT_TYPE_APP_VND_MAIL, "" },
- { "sdp", CONTENT_TYPE_APP_VND_IMPRESSPACKED, "" },
- { "sds", CONTENT_TYPE_APP_VND_CHART, "" },
- { "sdw", CONTENT_TYPE_APP_VND_WRITER, "" },
- { "sd~", CONTENT_TYPE_X_STARMAIL, "" },
- { "sfs", CONTENT_TYPE_APP_FRAMESET , "" },
- { "sgl", CONTENT_TYPE_APP_VND_WRITER_GLOBAL , "" },
- { "sim", CONTENT_TYPE_APP_VND_IMAGE, "" },
- { "smd", CONTENT_TYPE_APP_STARMAIL_SMD, "" }, //CONTENT_TYPE_X_STARMAIL
- { "smf", CONTENT_TYPE_APP_VND_MATH, "" },
- { "svh", CONTENT_TYPE_APP_STARHELP, "" },
- { "svm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "sxc", CONTENT_TYPE_APP_VND_SUN_XML_CALC, "" },
- { "sxd", CONTENT_TYPE_APP_VND_SUN_XML_DRAW, "" },
- { "sxg", CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL, "" },
- { "sxi", CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS, "" },
- { "sxm", CONTENT_TYPE_APP_VND_SUN_XML_MATH, "" },
- { "sxp", CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED, "" },
- { "sxs", CONTENT_TYPE_APP_VND_SUN_XML_CHART, "" },
- { "sxw", CONTENT_TYPE_APP_VND_SUN_XML_WRITER, "" },
- { "tga", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "thm", CONTENT_TYPE_APP_GALLERY_THEME, "" },
- { "tif", CONTENT_TYPE_IMAGE_TIFF, "" },
- { "tiff", CONTENT_TYPE_IMAGE_TIFF, "" },
- { "txt", CONTENT_TYPE_TEXT_PLAIN, "" },
- { "url", CONTENT_TYPE_TEXT_URL, "" },
- { "vcf", CONTENT_TYPE_TEXT_VCARD, "" },
- { "vcs", CONTENT_TYPE_TEXT_VCALENDAR, "" },
- { "vdo", CONTENT_TYPE_VIDEO_VDO, "" },
- { "vor", CONTENT_TYPE_APP_VND_TEMPLATE, "" },
- { "wav", CONTENT_TYPE_AUDIO_WAV, "" },
- { "webm", CONTENT_TYPE_VIDEO_WEBM, "" },
- { "wmf", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "wrl", CONTENT_TYPE_X_VRML, "" },
- { "xbm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "xcs", CONTENT_TYPE_TEXT_XMLICALENDAR, "" },
- { "xls", CONTENT_TYPE_APP_MSEXCEL, "" },
- { "xlt", CONTENT_TYPE_APP_MSEXCEL_TEMPL, "" },
- { "xlw", CONTENT_TYPE_APP_MSEXCEL, "" },
- { "xpm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "zip", CONTENT_TYPE_APP_ZIP, "" } };
+ = { { "aif", CONTENT_TYPE_AUDIO_AIFF },
+ { "aiff", CONTENT_TYPE_AUDIO_AIFF },
+ { "appt", CONTENT_TYPE_APP_CDE_CALENDAR_APP },
+ { "au", CONTENT_TYPE_AUDIO_BASIC },
+ { "avi", CONTENT_TYPE_VIDEO_MSVIDEO },
+ { "bmp", CONTENT_TYPE_IMAGE_BMP },
+ { "cgm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "doc", CONTENT_TYPE_APP_MSWORD },
+ { "dot", CONTENT_TYPE_APP_MSWORD_TEMPL },
+ { "dxf", CONTENT_TYPE_IMAGE_GENERIC },
+ { "eps", CONTENT_TYPE_IMAGE_GENERIC },
+ { "gal", CONTENT_TYPE_APP_GALLERY },
+ { "gif", CONTENT_TYPE_IMAGE_GIF },
+ { "htm", CONTENT_TYPE_TEXT_HTML },
+ { "html", CONTENT_TYPE_TEXT_HTML },
+ { "ics", CONTENT_TYPE_TEXT_ICALENDAR },
+ { "jar", CONTENT_TYPE_APP_JAR },
+ { "jpeg", CONTENT_TYPE_IMAGE_JPEG },
+ { "jpg", CONTENT_TYPE_IMAGE_JPEG },
+ { "met", CONTENT_TYPE_IMAGE_GENERIC },
+ { "mid", CONTENT_TYPE_AUDIO_MIDI },
+ { "midi", CONTENT_TYPE_AUDIO_MIDI },
+ { "ogg", CONTENT_TYPE_AUDIO_VORBIS },
+ { "pbm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "pcd", CONTENT_TYPE_IMAGE_GENERIC },
+ { "pct", CONTENT_TYPE_IMAGE_GENERIC },
+ { "pcx", CONTENT_TYPE_IMAGE_PCX },
+ { "pdf", CONTENT_TYPE_APP_PDF },
+ { "pgm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "png", CONTENT_TYPE_IMAGE_PNG },
+ { "pot", CONTENT_TYPE_APP_MSPPOINT_TEMPL },
+ { "ppm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "ppt", CONTENT_TYPE_APP_MSPPOINT },
+ { "psd", CONTENT_TYPE_IMAGE_GENERIC },
+ { "ras", CONTENT_TYPE_IMAGE_GENERIC },
+ { "rtf", CONTENT_TYPE_APP_RTF },
+ { "sda", CONTENT_TYPE_APP_VND_DRAW },
+ { "sdc", CONTENT_TYPE_APP_VND_CALC },
+ { "sdd", CONTENT_TYPE_APP_VND_IMPRESS },
+ { "sdm", CONTENT_TYPE_APP_VND_MAIL },
+ { "sdp", CONTENT_TYPE_APP_VND_IMPRESSPACKED },
+ { "sds", CONTENT_TYPE_APP_VND_CHART },
+ { "sdw", CONTENT_TYPE_APP_VND_WRITER },
+ { "sd~", CONTENT_TYPE_X_STARMAIL },
+ { "sfs", CONTENT_TYPE_APP_FRAMESET },
+ { "sgl", CONTENT_TYPE_APP_VND_WRITER_GLOBAL },
+ { "sim", CONTENT_TYPE_APP_VND_IMAGE },
+ { "smd", CONTENT_TYPE_APP_STARMAIL_SMD }, //CONTENT_TYPE_X_STARMAIL
+ { "smf", CONTENT_TYPE_APP_VND_MATH },
+ { "svh", CONTENT_TYPE_APP_STARHELP },
+ { "svm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "sxc", CONTENT_TYPE_APP_VND_SUN_XML_CALC },
+ { "sxd", CONTENT_TYPE_APP_VND_SUN_XML_DRAW },
+ { "sxg", CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL },
+ { "sxi", CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS },
+ { "sxm", CONTENT_TYPE_APP_VND_SUN_XML_MATH },
+ { "sxp", CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED },
+ { "sxs", CONTENT_TYPE_APP_VND_SUN_XML_CHART },
+ { "sxw", CONTENT_TYPE_APP_VND_SUN_XML_WRITER },
+ { "tga", CONTENT_TYPE_IMAGE_GENERIC },
+ { "thm", CONTENT_TYPE_APP_GALLERY_THEME },
+ { "tif", CONTENT_TYPE_IMAGE_TIFF },
+ { "tiff", CONTENT_TYPE_IMAGE_TIFF },
+ { "txt", CONTENT_TYPE_TEXT_PLAIN },
+ { "url", CONTENT_TYPE_TEXT_URL },
+ { "vcf", CONTENT_TYPE_TEXT_VCARD },
+ { "vcs", CONTENT_TYPE_TEXT_VCALENDAR },
+ { "vdo", CONTENT_TYPE_VIDEO_VDO },
+ { "vor", CONTENT_TYPE_APP_VND_TEMPLATE },
+ { "wav", CONTENT_TYPE_AUDIO_WAV },
+ { "webm", CONTENT_TYPE_VIDEO_WEBM },
+ { "wmf", CONTENT_TYPE_IMAGE_GENERIC },
+ { "wrl", CONTENT_TYPE_X_VRML },
+ { "xbm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "xcs", CONTENT_TYPE_TEXT_XMLICALENDAR },
+ { "xls", CONTENT_TYPE_APP_MSEXCEL },
+ { "xlt", CONTENT_TYPE_APP_MSEXCEL_TEMPL },
+ { "xlw", CONTENT_TYPE_APP_MSEXCEL },
+ { "xpm", CONTENT_TYPE_IMAGE_GENERIC },
+ { "zip", CONTENT_TYPE_APP_ZIP } };
}
commit bc8c158ec6ba24b1ecaf5d3d57deb65ef0670f6c
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:53:14 2015 +0200
loplugin:unusedfields in store/
Change-Id: I0fae339e3736f98d5d534b8a01a3040c237c6621
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 3dec2a8..1278a38 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -131,8 +131,6 @@ public:
/** Representation.
*/
OStorePageDescriptor m_aDescr;
- sal_uInt32 m_nSize;
- sal_uInt32 m_nMagic;
/** Construction.
*/
@@ -216,7 +214,7 @@ inline bool OStorePageBIOS::isValid() const
}
inline OStorePageBIOS::ScanContext::ScanContext()
- : m_aDescr (0, 0, 0), m_nSize (0), m_nMagic (0)
+ : m_aDescr (0, 0, 0)
{
}
commit d47079668ee1a996685399521092fdaa5560be29
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:50:07 2015 +0200
loplugin:unusedfields in sot/
Change-Id: Ia1711d9289992525ed366f3dedcf95b6289f1eaa
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 1668d6d..8428604 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -480,7 +480,6 @@ public:
SvStream* m_pSource; // original stream, only for
storages on a stream
ErrCode m_nError;
StreamMode m_nMode; // open mode (
read/write/trunc/nocreate/sharing )
- bool m_bModified; // only modified elements will
be sent to the original content
bool m_bCommited; // sending the streams is
coordinated by the root storage of the package
bool m_bDirect; // the storage and its streams
are opened in direct mode; for UCBStorages
// this means that the root
storage does an autocommit when its external
@@ -1516,7 +1515,6 @@ UCBStorage_Impl::UCBStorage_Impl( const
::ucbhelper::Content& rContent, const OU
//, m_pStream( NULL )
, m_nError( 0 )
, m_nMode( nMode )
- , m_bModified( false )
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( bIsRoot )
@@ -1549,7 +1547,6 @@ UCBStorage_Impl::UCBStorage_Impl( const OUString& rName,
StreamMode nMode, UCBSt
//, m_pStream( NULL )
, m_nError( 0 )
, m_nMode( nMode )
- , m_bModified( false )
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( bIsRoot )
@@ -1600,7 +1597,6 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream,
UCBStorage* pStorage, bool
, m_pTempFile( new ::utl::TempFile )
, m_pSource( &rStream )
, m_nError( 0 )
- , m_bModified( false )
, m_bCommited( false )
, m_bDirect( bDirect )
, m_bIsRoot( true )
commit a07fc5bc15647f8fc368ee81a5dc67652c024eec
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:25:01 2015 +0200
loplugin:unusedfields in soltools/
Change-Id: I895a487b4c7be27fe81a2c4c122adb2aba37c638
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index d831b5b..fbe6032 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -128,7 +128,6 @@ struct inclist {
char *i_file; /* path name of the include file */
struct inclist **i_list; /* list of files it itself includes */
int i_listlen; /* length of i_list */
- boolean i_defchecked; /* whether defines have been checked */
boolean i_notified; /* whether we have revealed includes */
boolean i_marked; /* whether it's in the makefile */
boolean i_searched; /* whether we have read this */
commit 04fe52e947a63213358ce517df4f75e34578751e
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:24:16 2015 +0200
loplugin:unusedfields in slideshow/
Change-Id: I509dd0bdda284abb2b8abdb809bf1dec8b9632ce
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx
b/slideshow/source/engine/activities/activitiesfactory.cxx
index a237f54..f982a60 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -141,7 +141,6 @@ public:
value, or start fresh each time.
*/
FromToByActivity(
- const OptionalValueType& rFrom,
const OptionalValueType& rTo,
const OptionalValueType& rBy,
const ActivityParameters& rParms,
@@ -149,9 +148,6 @@ public:
const Interpolator< ValueType >& rInterpolator,
bool bCumulative )
: BaseType( rParms ),
- maFrom( rFrom ),
- maTo( rTo ),
- maBy( rBy ),
mpFormula( rParms.mpFormula ),
maStartValue(),
maEndValue(),
@@ -273,10 +269,6 @@ public:
}
private:
- const OptionalValueType maFrom;
- const OptionalValueType maTo;
- const OptionalValueType maBy;
-
ExpressionNodeSharedPtr mpFormula;
ValueType maStartValue;
@@ -346,7 +338,6 @@ AnimationActivitySharedPtr createFromToByActivity(
return AnimationActivitySharedPtr(
new FromToByActivity<BaseType, AnimationType>(
- aFrom,
aTo,
aBy,
rParms,
commit 018bacf44a49f83eae34e2fb2187ffcb83259a65
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:20:48 2015 +0200
loplugin:unusedfields in shell/
Change-Id: I3a3f7144483cebaad6d64588ff0570f29ab24e27
diff --git a/shell/inc/internal/xml_parser.hxx
b/shell/inc/internal/xml_parser.hxx
index 975f17a..40c97ed 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -30,22 +30,10 @@ class xml_parser_exception : public std::runtime_error
public:
xml_parser_exception(
- const std::string& error_msg,
- int error_code,
- int line_number,
- int column_number,
- long byte_index) :
- std::runtime_error(error_msg),
- error_code_(error_code),
- line_number_(line_number),
- column_number_(column_number),
- byte_index_(byte_index)
+ const std::string& error_msg) :
+ std::runtime_error(error_msg)
{}
- int error_code_;
- int line_number_;
- int column_number_;
- long byte_index_;
};
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 893cf08..6d55721 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -178,11 +178,7 @@ void xml_parser::parse(const char* XmlData, size_t Length,
bool IsFinal)
XML_Parse(xml_parser_, XmlData, static_cast<int>(Length), IsFinal))
{
throw xml_parser_exception(
- XML_ErrorString(XML_GetErrorCode(xml_parser_)),
- (int)XML_GetErrorCode(xml_parser_),
- XML_GetCurrentLineNumber(xml_parser_),
- XML_GetCurrentColumnNumber(xml_parser_),
- XML_GetCurrentByteIndex(xml_parser_));
+ XML_ErrorString(XML_GetErrorCode(xml_parser_)));
}
}
commit 1aa29c829121d19548143a0e3b97b061c72afb3a
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 11:18:55 2015 +0200
loplugin:unusedfields in sfx2/
Change-Id: Id0d81901501683001107677c5573450c857ad094
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index b2635fc..77e6a95 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -102,8 +102,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pAppDispatch(nullptr)
, pTemplates( nullptr )
, pPool(nullptr)
- , pSaveOptions( nullptr )
- , pHelpOptions( nullptr )
, pProgress(nullptr)
, nDocModalMode(0)
, nAutoTabPageId(0)
@@ -116,20 +114,15 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pViewFrames(nullptr)
, pViewShells(nullptr)
, pObjShells(nullptr)
- , pSfxResManager(nullptr)
, pBasicManager( new SfxBasicManagerHolder )
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( nullptr )
, pSlotPool( nullptr )
, pAppDispat( nullptr )
, pInterfaces( nullptr )
- , nDocNo(0)
, nInterfaces( 0 )
- , bDispatcherLocked( false )
, bDowning( true )
, bInQuit( false )
- , bInvalidateOnUnlock( false )
- , bODFVersionWarningLater( false )
{
#if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index e78fad7..9e9b164 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -300,7 +300,7 @@ void SfxPickList::CreatePickListEntries()
aURL.SetSmartURL( sURL );
aURL.SetPass( OUString() );
- PickListEntry *pPick = new PickListEntry( aURL.GetMainURL(
INetURLObject::NO_DECODE ), sFilter, sTitle );
+ PickListEntry *pPick = new PickListEntry( aURL.GetMainURL(
INetURLObject::NO_DECODE ), sFilter );
m_aPicklistVector.push_back( pPick );
}
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index fabf45f..5d13693 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -85,13 +85,11 @@ typedef std::vector<SfxStateCache*> SfxStateCacheArr_Impl;
struct SfxFoundCache_Impl
{
- sal_uInt16 nSlotId; // the Slot-Id
sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
const SfxSlot* pSlot; // Pointer to <Master-Slot>
SfxStateCache* pCache; // Pointer to StatusCache, if possible NULL
- SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS,
SfxStateCache *pC ):
- nSlotId(nS),
+ SfxFoundCache_Impl(sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ):
nWhichId(nW),
pSlot(pS),
pCache(pC)
@@ -444,9 +442,7 @@ void SfxBindings::Update_Impl
// When pCache == NULL and no SlotServer
// (for example due to locked Dispatcher! ),
// obviously do not try to update
- SfxFoundCache_Impl aFoundCache(
- pCache->GetId(), 0,
- pRealSlot, pCache );
+ SfxFoundCache_Impl aFoundCache(0, pRealSlot, pCache );
UpdateControllers_Impl( nullptr, aFoundCache, nullptr,
SfxItemState::DISABLED);
}
}
@@ -1360,7 +1356,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
// the RealSlot is always on
SfxFoundCache_Impl *pFound = new SfxFoundCache_Impl(
- pRealSlot->GetSlotId(), pRealSlot->GetWhich(rPool), pRealSlot, pCache
);
+ pRealSlot->GetWhich(rPool), pRealSlot, pCache );
rFound.push_back( pFound );
// Search through the bindings for slots served by the same function. This
, // will only affect slots which are present in the found interface.
@@ -1420,7 +1416,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
if ( bInsert && bSameMethod )
{
SfxFoundCache_Impl *pFoundCache = new SfxFoundCache_Impl(
- pSibling->GetSlotId(), pSibling->GetWhich(rPool),
+ pSibling->GetWhich(rPool),
pSibling, pSiblingCache );
rFound.push_back( pFoundCache );
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 8ec2ce8..023b4cb 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -126,7 +126,6 @@ struct SfxDispatcher_Impl
SfxObjectBars_Impl aObjBars[SFX_OBJECTBAR_MAX];
SfxObjectBars_Impl aFixedObjBars[SFX_OBJECTBAR_MAX];
std::vector<sal_uInt32> aChildWins;
- sal_uInt32 nEventId; // EventId UserEvent
bool bNoUI; // UI only from Parent Dispatcher
bool bReadOnly; // Document is ReadOnly
bool bQuiet; // Only use parent dispatcher
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fea4f79..aafe9c7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -657,8 +657,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
// Constructor
SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB,
vcl::Window* pW, bool )
- : mbIgnoreSelect(false)
- , pBindings(pB)
+ : pBindings(pB)
, pWindow(pW)
, pModule(nullptr)
, pIdle(nullptr)
@@ -679,7 +678,6 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(
SfxBindings* pB, vcl
, bDontUpdate(false)
, bIsWater(false)
- , bEnabled(true)
, bUpdate(false)
, bUpdateFamily(false)
, bCanEdit(false)
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index f9426b8..953369d 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -65,17 +65,12 @@ struct SfxObjectFactory_Impl
OUString aServiceName;
SfxFilterContainer* pFilterContainer;
SfxModule* pModule;
- sal_uInt16 nImageId;
- OUString aStandardTemplate;
- bool bTemplateInitialized;
SvGlobalName aClassName;
SfxObjectFactory_Impl() :
pNameResId ( nullptr ),
pFilterContainer ( nullptr ),
- pModule ( nullptr ),
- nImageId ( 0 ),
- bTemplateInitialized( false )
+ pModule ( nullptr )
{}
};
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 563803a..94633e6 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -203,7 +203,6 @@ public:
const SfxFilter* m_pFilter;
std::unique_ptr<SfxFilter> m_pCustomFilter;
- SfxMedium* pAntiImpl;
SvStream* m_pInStream;
SvStream* m_pOutStream;
@@ -239,7 +238,7 @@ public:
util::DateTime m_aDateTime;
- explicit SfxMedium_Impl( SfxMedium* pAntiImplP );
+ explicit SfxMedium_Impl();
~SfxMedium_Impl();
OUString getFilterMimeType()
@@ -247,7 +246,7 @@ public:
};
-SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
+SfxMedium_Impl::SfxMedium_Impl() :
m_nStorOpenMode(SFX_STREAM_READWRITE),
m_eError(SVSTREAM_OK),
bUpdatePickList(true),
@@ -272,7 +271,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
m_pSet(nullptr),
m_pURLObj(nullptr),
m_pFilter(nullptr),
- pAntiImpl( pAntiImplP ),
m_pInStream(nullptr),
m_pOutStream(nullptr),
pOrigFilter( nullptr ),
@@ -2602,7 +2600,7 @@ void SfxMedium::Init_Impl()
}
-SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl(this))
+SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl)
{
Init_Impl();
}
@@ -2943,7 +2941,7 @@ void SfxMedium::CompleteReOpen()
}
SfxMedium::SfxMedium(const OUString &rName, StreamMode nOpenMode, const
SfxFilter *pFlt, SfxItemSet *pInSet) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pSet = pInSet;
pImp->m_pFilter = pFlt;
@@ -2953,7 +2951,7 @@ SfxMedium::SfxMedium(const OUString &rName, StreamMode
nOpenMode, const SfxFilte
}
SfxMedium::SfxMedium(const OUString &rName, const OUString &rReferer,
StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pSet = pInSet;
SfxItemSet * s = GetItemSet();
@@ -2967,7 +2965,7 @@ SfxMedium::SfxMedium(const OUString &rName, const
OUString &rReferer, StreamMode
}
SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
SfxAllItemSet *pParams = new SfxAllItemSet( SfxGetpApp()->GetPool() );
pImp->m_pSet = pParams;
@@ -3037,7 +3035,7 @@ SfxMedium::SfxMedium( const
uno::Sequence<beans::PropertyValue>& aArgs ) :
SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const
OUString& rBaseURL, const SfxItemSet* p ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
OUString aType = SfxFilter::GetTypeFromStorage(rStor);
pImp->m_pFilter = SfxGetpApp()->GetFilterMatcher().GetFilter4EA( aType );
@@ -3056,7 +3054,7 @@ SfxMedium::SfxMedium( const uno::Reference <
embed::XStorage >& rStor, const OUS
SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const
OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pFilter = SfxGetpApp()->GetFilterMatcher().GetFilter4EA( rTypeName
);
DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d9523d5..9a75ed9 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -226,7 +226,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell&
_rDocShell )
,bBasicInitialized( false )
,bIsPrintJobCancelable( true )
,bOwnsStorage( true )
- ,bNoBaseURL( false )
,bInitialized( false )
,bSignatureErrorIsShown( false )
,bModelInitialized( false )
@@ -252,7 +251,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell&
_rDocShell )
,bRunningMacro( false )
,bReloadAvailable( false )
,nAutoLoadLocks( 0 )
- ,pModule( nullptr )
,eFlags( SfxObjectShellFlags::UNDEFINED )
,bReadOnlyUI( false )
,nStyleFilter( 0 )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3e10656..56ae242 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -204,7 +204,6 @@ struct IMPL_SfxBaseModel_DataContainer : public
::sfx2::IModifiableDocument
bool m_bClosing
;
bool m_bSaving
;
bool m_bSuicide
;
- bool m_bInitialized
;
bool
m_bExternalTitle ;
bool
m_bModifiedSinceLastSave ;
Reference< view::XPrintable> m_xPrintable
;
@@ -227,7 +226,6 @@ struct IMPL_SfxBaseModel_DataContainer : public
::sfx2::IModifiableDocument
, m_bClosing ( false )
, m_bSaving ( false )
, m_bSuicide ( false )
- , m_bInitialized ( false )
, m_bExternalTitle ( false )
, m_bModifiedSinceLastSave( false )
, m_pStorageModifyListen ( nullptr )
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 3c17d3b..46834b3 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -98,8 +98,6 @@ public:
// global pointers
SfxItemPool* pPool;
- SvtSaveOptions* pSaveOptions;
- SvtHelpOptions* pHelpOptions;
// "current" functionality
SfxProgress* pProgress;
@@ -117,7 +115,6 @@ public:
SfxViewFrameArr_Impl* pViewFrames;
SfxViewShellArr_Impl* pViewShells;
SfxObjectShellArr_Impl* pObjShells;
- ResMgr* pSfxResManager;
SfxBasicManagerHolder* pBasicManager;
SfxBasicManagerCreationListener*
pBasMgrListener;
@@ -127,14 +124,10 @@ public:
SfxInterface** pInterfaces;
::rtl::Reference<sfx2::sidebar::Theme> m_pSidebarTheme;
- sal_uInt16 nDocNo; // current Doc-Number
(AutoName)
- sal_uInt16 nInterfaces;
+ sal_uInt16 nInterfaces;
- bool bDispatcherLocked:1; // do nothing
bool bDowning:1; // sal_True on Exit and
afterwards
bool bInQuit : 1;
- bool bInvalidateOnUnlock : 1;
- bool bODFVersionWarningLater : 1;
SfxAppData_Impl( SfxApplication* );
~SfxAppData_Impl();
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 6e2f568..a631003 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -78,7 +78,6 @@ struct SfxObjectShell_Impl : public
::sfx2::IMacroDocumentAccess
bBasicInitialized :1,
bIsPrintJobCancelable :1, // Stampit disable/enable
cancel button for print jobs ... default = true = enable!
bOwnsStorage:1,
- bNoBaseURL:1,
bInitialized:1,
bSignatureErrorIsShown:1,
bModelInitialized:1, // whether the related model is
initialized
@@ -107,12 +106,11 @@ struct SfxObjectShell_Impl : public
::sfx2::IMacroDocumentAccess
bool bRunningMacro;
bool bReloadAvailable;
sal_uInt16 nAutoLoadLocks;
- SfxModule* pModule;
- SfxObjectShellFlags eFlags;
+ SfxObjectShellFlags eFlags;
bool bReadOnlyUI;
tools::SvRef<SvRefBase> xHeaderAttributes;
::rtl::Reference< SfxBaseModel >
- pBaseModel;
+ pBaseModel;
sal_uInt16 nStyleFilter;
bool bDisposing;
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 9a87074..c7c70e2 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -33,13 +33,11 @@ class SfxPickList : public SfxListener
{
struct PickListEntry
{
- PickListEntry( const OUString& _aName, const OUString& _aFilter, const
OUString& _aTitle ) :
- aName( _aName ), aFilter( _aFilter ), aTitle( _aTitle ) {}
+ PickListEntry( const OUString& _aName, const OUString& _aFilter ) :
+ aName( _aName ), aFilter( _aFilter ) {}
OUString aName;
OUString aFilter;
- OUString aTitle;
- OUString aOptions;
};
std::vector< PickListEntry* > m_aPicklistVector;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 5419038..8b640c2 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -159,8 +159,6 @@ private:
class DeletionWatcher;
friend class DeletionWatcher;
- bool mbIgnoreSelect;
-
void ReadResource();
void ClearResource();
void impl_clear();
@@ -202,7 +200,6 @@ protected:
bool bDontUpdate :1;
bool bIsWater :1;
- bool bEnabled :1;
bool bUpdate :1;
bool bUpdateFamily :1;
bool bCanEdit :1;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 3dc5255..55334bf 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -156,15 +156,6 @@ enum class SfxDockingConfig
};
-struct SfxObjectBarList_Impl
-{
- std::deque<SfxObjectBar_Impl> aArr;
- sal_uInt16 nAct;
-
- SfxObjectBar_Impl operator[] ( sal_uInt16 n )
- { return aArr[n]; }
-};
-
#define SFX_SPLITWINDOWS_LEFT 0
#define SFX_SPLITWINDOWS_TOP 2
#define SFX_SPLITWINDOWS_RIGHT 1
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 33d4d79..ee08b52 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -83,7 +83,7 @@ SfxPoolItem* SfxUnoFrameItem::CreateDefault()
}
void SfxFrame::Construct_Impl()
{
- pImp = new SfxFrame_Impl( this );
+ pImp = new SfxFrame_Impl;
if ( !pFramesArr_Impl )
pFramesArr_Impl = new SfxFrameArr_Impl;
pFramesArr_Impl->push_back( this );
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 18a3ec2..1229b44 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -40,14 +40,12 @@ public:
sal_uInt32 nType;
SfxViewFrame* pCurrentViewFrame;
SfxFrameDescriptor* pDescr;
- sal_uInt16 nLocks;
bool bClosing : 1;
bool bPrepClosing : 1;
bool bInCancelTransfers : 1;
bool bOwnsBindings : 1;
bool bReleasingComponent : 1;
bool bInPlace : 1;
- SfxFrame* pFrame;
SfxWorkWindow* pWorkWin;
SvBorder aBorder;
// formerly SfxTopFrame
@@ -56,18 +54,16 @@ public:
bool bLockResize;
bool bMenuBarOn;
- explicit SfxFrame_Impl( SfxFrame* pAntiImplP )
+ explicit SfxFrame_Impl()
:nType( 0L )
,pCurrentViewFrame( nullptr )
,pDescr( nullptr )
- ,nLocks( 0 )
,bClosing(false)
,bPrepClosing(false)
,bInCancelTransfers( false )
,bOwnsBindings( false )
,bReleasingComponent( false )
,bInPlace( false )
- ,pFrame( pAntiImplP )
,pWorkWin( nullptr )
,pExternalContainerWindow( nullptr )
,bHidden( false )
commit 990691b144c1292f0263e0a8b8704b0ccbd7a168
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 09:58:38 2015 +0200
loplugin:unusedfields in sdext/
Change-Id: Ibf5083cde3553289b3a29c9b992800e4bd82e6e4
diff --git a/sdext/source/minimizer/fileopendialog.hxx
b/sdext/source/minimizer/fileopendialog.hxx
index 4292d2e..ac2ea7f 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -35,7 +35,6 @@ class FileOpenDialog
OUString maName;
OUString maType;
OUString maUIName;
- OUString maFilter;
sal_Int32 maFlags;
css::uno::Sequence< OUString > maExtensions;
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx
b/sdext/source/presenter/PresenterSlideSorter.cxx
index aab7390..58e5ebe 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -119,7 +119,6 @@ public:
sal_Int32 mnRowCount;
sal_Int32 mnColumnCount;
sal_Int32 mnSlideCount;
- sal_Int32 mnSlideIndexAtMouse;
sal_Int32 mnFirstVisibleColumn;
sal_Int32 mnLastVisibleColumn;
sal_Int32 mnFirstVisibleRow;
@@ -1140,7 +1139,6 @@ PresenterSlideSorter::Layout::Layout (
mnRowCount(1),
mnColumnCount(1),
mnSlideCount(0),
- mnSlideIndexAtMouse(-1),
mnFirstVisibleColumn(-1),
mnLastVisibleColumn(-1),
mnFirstVisibleRow(-1),
diff --git a/sdext/source/presenter/PresenterTheme.cxx
b/sdext/source/presenter/PresenterTheme.cxx
index 3b2b79c..aa85c87 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -247,7 +247,6 @@ public:
SharedBitmapDescriptor mpBackground;
PaneStyleContainer maPaneStyles;
ViewStyleContainer maViewStyles;
- ViewDescriptorContainer maViewDescriptors;
StyleAssociationContainer maStyleAssociations;
Reference<container::XHierarchicalNameAccess> mxThemeRoot;
std::shared_ptr<PresenterBitmapContainer> mpIconContainer;
commit 980fe3f79102fdeb8d1b997668d9d5c2e1c7e690
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 23 09:57:02 2015 +0200
loplugin:unusedfields in sd/
Change-Id: Id6da990828ece02132032285116f3a20de423519
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index ddb9af0..89ba020 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -226,9 +226,6 @@ private:
/// The number of pages in the current view.
sal_uInt16 mnPageCount;
- /// Number of objects on the current page / in the current selection.
- sal_Int32 mnObjectCount;
-
/** A <TRUE/> value indicates that the end of the find&replace or spell
check has been reached.
*/
@@ -262,12 +259,6 @@ private:
*/
::std::vector<SdrObjectWeakRef> maMarkListCopy;
- /** This flag indicates that only the current view is to be used for
- searching and spelling. Automatically switching to other view does
- not take place when this flag is set.
- */
- bool mbProcessCurrentViewOnly;
-
/** Current object that may be a text object. The object pointer to
corresponds to <member>mnObjIndex</member>. While iterating over the
objects on a page <member>mpObj</member> will point to every object
@@ -326,12 +317,6 @@ private:
*/
::sd::outliner::IteratorPosition maLastValidPosition;
- /** This flag remembers a selection change between a call to the
- selection change listener callback and the next
- <member>DetectChange()</member> method call.
- */
- bool mbSelectionHasChanged;
-
/** This flag indicates whether a selection change event is expected due
to a programatical change of the selection.
*/
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index b4c6f8a..f140cca 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1178,15 +1178,13 @@ const int VERTICAL = 0x8000;
struct LayoutDescriptor
{
- int mnLayout;
PresObjKind meKind[MAX_PRESOBJS];
bool mbVertical[MAX_PRESOBJS];
- LayoutDescriptor( int nLayout, int k0 = 0, int k1 = 0, int k2 = 0, int k3
= 0, int k4 = 0, int k5 = 0, int k6 = 0 );
+ LayoutDescriptor( int k0 = 0, int k1 = 0, int k2 = 0, int k3 = 0, int k4 =
0, int k5 = 0, int k6 = 0 );
};
-LayoutDescriptor::LayoutDescriptor( int nLayout, int k0, int k1, int k2, int
k3, int k4, int k5, int k6 )
-: mnLayout( nLayout )
+LayoutDescriptor::LayoutDescriptor( int k0, int k1, int k2, int k3, int k4,
int k5, int k6 )
{
meKind[0] = static_cast<PresObjKind>(k0 & (~VERTICAL)); mbVertical[0] =
(k0 & VERTICAL) == VERTICAL;
meKind[1] = static_cast<PresObjKind>(k1 & (~VERTICAL)); mbVertical[1] =
(k1 & VERTICAL) == VERTICAL;
@@ -1201,43 +1199,43 @@ static const LayoutDescriptor& GetLayoutDescriptor(
AutoLayout eLayout )
{
static const LayoutDescriptor aLayouts[AUTOLAYOUT__END-AUTOLAYOUT__START] =
{
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ),
// AUTOLAYOUT_TITLE
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_ENUM
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_CHART
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_2TEXT
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_TEXTCHART
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_ORG
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_TEXTCLbIP
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_CHARTTEXT
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TAB
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_CLIPTEXT
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_TEXTOBJ
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ),
// AUTOLAYOUT_OBJ
- LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ
- LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_TEXTOBJ
- LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_OBJOVERTEXT
- LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT
- LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT
- LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
), // AUTOLAYOUT_TEXTOVEROBJ
- LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_4OBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ),
// AUTOLAYOUT_TITLE
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_ENUM
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_CHART
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_2TEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TEXTCHART
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_ORG
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TEXTCLbIP
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_CHARTTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TAB
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_CLIPTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TEXTOBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ),
// AUTOLAYOUT_OBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TEXTOBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_OBJOVERTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_TEXTOVEROBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_4OBJ
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),
// AUTOLAYOUT_ONLY_TITLE
- LayoutDescriptor( 0, PRESOBJ_NONE ),
// AUTOLAYOUT_NONE
- LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),
// AUTOLAYOUT_NOTES
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT1
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT2
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT3
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT4
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT6
- LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL,
PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
- LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL
), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
- LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ),
// AUTOLAYOUT_TITLE_VERTICAL_OUTLINE
- LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL,
PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART
- LayoutDescriptor( 0 ),
// AUTOLAYOUT_HANDOUT9
- LayoutDescriptor( 10, PRESOBJ_TEXT, PRESOBJ_NONE ),
// AUTOLAYOUT_ONLY_TEXT
- LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_4CLIPART
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_NONE ),
// AUTOLAYOUT_ONLY_TITLE
+ LayoutDescriptor( PRESOBJ_NONE ),
// AUTOLAYOUT_NONE
+ LayoutDescriptor( PRESOBJ_PAGE, PRESOBJ_NOTES ),
// AUTOLAYOUT_NOTES
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT1
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT2
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT3
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT4
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT6
+ LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL,
PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
+ LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ),
// AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ),
// AUTOLAYOUT_TITLE_VERTICAL_OUTLINE
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL,
PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART
+ LayoutDescriptor( ),
// AUTOLAYOUT_HANDOUT9
+ LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ),
// AUTOLAYOUT_ONLY_TEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_4CLIPART
PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ),
- LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_6CLIPART
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE,
// AUTOLAYOUT_6CLIPART
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
)
};
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index a272f82..9e5c4a7 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -91,7 +91,6 @@ PPTWriter::PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
mpExEmbed ( new SvMemoryStream ),
mnDrawings ( 0 ),
mnPagesWritten ( 0 ),
- mnUniqueSlideIdentifier ( 0 ),
mnTxId ( 0x7a2f64 ),
mnDiaMode ( 0 ),
mnShapeMasterTitle ( 0 ),
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index c500464..b24d797 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -136,11 +136,9 @@ struct PPTExOleObjEntry
struct TextRuleEntry
{
- int nPageNumber;
SvMemoryStream* pOut;
- explicit TextRuleEntry( int nPg ) :
- nPageNumber( nPg ),
+ explicit TextRuleEntry() :
pOut ( nullptr ){};
~TextRuleEntry() { delete pOut; };
@@ -191,7 +189,6 @@ class PPTWriter : public PPTWriterBase, public
PPTExBulletProvider
sal_uInt32 mnDrawings; // number of Slides +
masterpages + notes + handout
sal_uInt32 mnPagesWritten;
- sal_uInt32 mnUniqueSlideIdentifier;
sal_uInt32 mnTxId; // Identifier determined by
the HOST (PP) ????
sal_uInt32 mnDiaMode; // 0 -> manual
// 1 -> semi-automatic
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index 0297cf5..e0e9208 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -259,14 +259,13 @@ struct PPTExCharSheet
struct PPTExParaLevel
{
- bool mbIsBullet;
+ bool mbIsBullet;
sal_uInt16 mnBulletChar;
sal_uInt16 mnBulletFont;
sal_uInt16 mnBulletHeight;
sal_uInt32 mnBulletColor;
sal_uInt16 mnAdjust;
- sal_Int16 mnOOAdjust;
sal_uInt16 mnLineFeed;
sal_uInt16 mnUpperDist;
sal_uInt16 mnLowerDist;
@@ -274,7 +273,7 @@ struct PPTExParaLevel
sal_uInt16 mnBulletOfs;
sal_uInt16 mnDefaultTab;
- bool mbExtendedBulletsUsed;
+ bool mbExtendedBulletsUsed;
sal_uInt16 mnBulletId;
sal_uInt16 mnBulletStart;
sal_uInt32 mnMappedNumType;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 74c8807..91a9cde 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3309,7 +3309,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout,
EscherSolverContainer& a
else
nTextType = EPP_TEXTTYPE_Title;
- TextRuleEntry aTextRule( nPageNumber );
+ TextRuleEntry aTextRule;
SvMemoryStream aExtBu( 0x200, 0x200 );
ImplGetText();
ImplWriteTextStyleAtom( *pClientTextBox, nTextType,
nPObjects, &aTextRule, aExtBu, nullptr );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index ed0d70d..8848b8f 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -83,50 +83,42 @@ char const sXML_styleStreamName[] = "styles.xml";
char const sXML_contentStreamName[] = "content.xml";
char const sXML_settingsStreamName[] = "settings.xml";
-char const sXML_export_impress_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisExporter";
char const sXML_export_impress_meta_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisMetaExporter";
char const sXML_export_impress_styles_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisStylesExporter";
char const sXML_export_impress_content_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisContentExporter";
char const sXML_export_impress_settings_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisSettingsExporter";
-char const sXML_export_draw_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisExporter";
char const sXML_export_draw_meta_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisMetaExporter";
char const sXML_export_draw_styles_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisStylesExporter";
char const sXML_export_draw_content_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisContentExporter";
char const sXML_export_draw_settings_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisSettingsExporter";
-char const sXML_import_impress_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisImporter";
char const sXML_import_impress_meta_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisMetaImporter";
char const sXML_import_impress_styles_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisStylesImporter";
char const sXML_import_impress_content_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisContentImporter";
char const sXML_import_impress_settings_oasis_service[] =
"com.sun.star.comp.Impress.XMLOasisSettingsImporter";
-char const sXML_import_draw_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisImporter";
char const sXML_import_draw_meta_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisMetaImporter";
char const sXML_import_draw_styles_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisStylesImporter";
char const sXML_import_draw_content_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisContentImporter";
char const sXML_import_draw_settings_oasis_service[] =
"com.sun.star.comp.Draw.XMLOasisSettingsImporter";
// OOo
-char const sXML_export_impress_ooo_service[] =
"com.sun.star.comp.Impress.XMLExporter";
char const sXML_export_impress_meta_ooo_service[] =
"com.sun.star.comp.Impress.XMLMetaExporter";
char const sXML_export_impress_styles_ooo_service[] =
"com.sun.star.comp.Impress.XMLStylesExporter";
char const sXML_export_impress_content_ooo_service[] =
"com.sun.star.comp.Impress.XMLContentExporter";
char const sXML_export_impress_settings_ooo_service[] =
"com.sun.star.comp.Impress.XMLSettingsExporter";
-char const sXML_export_draw_ooo_service[] =
"com.sun.star.comp.Draw.XMLExporter";
char const sXML_export_draw_meta_ooo_service[] =
"com.sun.star.comp.Draw.XMLMetaExporter";
char const sXML_export_draw_styles_ooo_service[] =
"com.sun.star.comp.Draw.XMLStylesExporter";
char const sXML_export_draw_content_ooo_service[] =
"com.sun.star.comp.Draw.XMLContentExporter";
char const sXML_export_draw_settings_ooo_service[] =
"com.sun.star.comp.Draw.XMLSettingsExporter";
-char const sXML_import_impress_ooo_service[] =
"com.sun.star.comp.Impress.XMLImporter";
char const sXML_import_impress_meta_ooo_service[] =
"com.sun.star.comp.Impress.XMLMetaImporter";
char const sXML_import_impress_styles_ooo_service[] =
"com.sun.star.comp.Impress.XMLStylesImporter";
char const sXML_import_impress_content_ooo_service[] =
"com.sun.star.comp.Impress.XMLContentImporter";
char const sXML_import_impress_settings_ooo_service[] =
"com.sun.star.comp.Impress.XMLSettingsImporter";
-char const sXML_import_draw_ooo_service[] =
"com.sun.star.comp.Draw.XMLImporter";
char const sXML_import_draw_meta_ooo_service[] =
"com.sun.star.comp.Draw.XMLMetaImporter";
char const sXML_import_draw_styles_ooo_service[] =
"com.sun.star.comp.Draw.XMLStylesImporter";
char const sXML_import_draw_content_ooo_service[] =
"com.sun.star.comp.Draw.XMLContentImporter";
@@ -140,7 +132,6 @@ struct XML_SERVICEMAP
struct XML_SERVICES
{
- const sal_Char* mpAll;
const sal_Char* mpMeta;
const sal_Char* mpStyles;
const sal_Char* mpContent;
@@ -151,15 +142,15 @@ XML_SERVICES* getServices( bool bImport, bool bDraw,
sal_uLong nStoreVer )
{
static XML_SERVICES gServices[] =
{
- { sXML_export_impress_oasis_service,
sXML_export_impress_meta_oasis_service,
sXML_export_impress_styles_oasis_service,
sXML_export_impress_content_oasis_service,
sXML_export_impress_settings_oasis_service },
- { sXML_export_draw_oasis_service, sXML_export_draw_meta_oasis_service,
sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service,
sXML_export_draw_settings_oasis_service },
- { sXML_import_impress_oasis_service,
sXML_import_impress_meta_oasis_service,
sXML_import_impress_styles_oasis_service,
sXML_import_impress_content_oasis_service,
sXML_import_impress_settings_oasis_service },
- { sXML_import_draw_oasis_service, sXML_import_draw_meta_oasis_service,
sXML_import_draw_styles_oasis_service, sXML_import_draw_content_oasis_service,
sXML_import_draw_settings_oasis_service },
-
- { sXML_export_impress_ooo_service,
sXML_export_impress_meta_ooo_service, sXML_export_impress_styles_ooo_service,
sXML_export_impress_content_ooo_service,
sXML_export_impress_settings_ooo_service },
- { sXML_export_draw_ooo_service, sXML_export_draw_meta_ooo_service,
sXML_export_draw_styles_ooo_service, sXML_export_draw_content_ooo_service,
sXML_export_draw_settings_ooo_service },
- { sXML_import_impress_ooo_service,
sXML_import_impress_meta_ooo_service, sXML_import_impress_styles_ooo_service,
sXML_import_impress_content_ooo_service,
sXML_import_impress_settings_ooo_service },
- { sXML_import_draw_ooo_service, sXML_import_draw_meta_ooo_service,
sXML_import_draw_styles_ooo_service, sXML_import_draw_content_ooo_service,
sXML_import_draw_settings_ooo_service },
+ { sXML_export_impress_meta_oasis_service,
sXML_export_impress_styles_oasis_service,
sXML_export_impress_content_oasis_service,
sXML_export_impress_settings_oasis_service },
+ { sXML_export_draw_meta_oasis_service,
sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service,
sXML_export_draw_settings_oasis_service },
+ { sXML_import_impress_meta_oasis_service,
sXML_import_impress_styles_oasis_service,
sXML_import_impress_content_oasis_service,
sXML_import_impress_settings_oasis_service },
+ { sXML_import_draw_meta_oasis_service,
sXML_import_draw_styles_oasis_service, sXML_import_draw_content_oasis_service,
sXML_import_draw_settings_oasis_service },
+
+ { sXML_export_impress_meta_ooo_service,
sXML_export_impress_styles_ooo_service,
sXML_export_impress_content_ooo_service,
sXML_export_impress_settings_ooo_service },
+ { sXML_export_draw_meta_ooo_service,
sXML_export_draw_styles_ooo_service, sXML_export_draw_content_ooo_service,
sXML_export_draw_settings_ooo_service },
+ { sXML_import_impress_meta_ooo_service,
sXML_import_impress_styles_ooo_service,
sXML_import_impress_content_ooo_service,
sXML_import_impress_settings_ooo_service },
+ { sXML_import_draw_meta_ooo_service,
sXML_import_draw_styles_ooo_service, sXML_import_draw_content_ooo_service,
sXML_import_draw_settings_ooo_service },
};
return &gServices[ (bImport ? 2 : 0) + ((nStoreVer ==
SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ];
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index fa7338b..e7db43c 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -33,8 +33,7 @@ namespace accessibility {
AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView,
OutputDevice& rDevice)
: mpView (pView),
- mnWindowId (0),
- mrDevice (rDevice)
+ mnWindowId (0)
{
// Search the output device to determine its id.
for(sal_uInt32 a(0L); a < mpView->PaintWindowCount(); a++)
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index da1160d..efe545b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -85,52 +85,51 @@ struct snewfoil_value_info
{
sal_uInt16 mnBmpResId;
sal_uInt16 mnStrResId;
- WritingMode meWritingMode;
AutoLayout maAutoLayout;
};
static const snewfoil_value_info notes[] =
{
- {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES},
- {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
+ {0, 0, AUTOLAYOUT_NONE},
};
static const snewfoil_value_info handout[] =
{
- {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
- {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT2},
- {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT3},
- {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT4},
- {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT6},
- {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT9},
- {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
+ {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
+ {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, AUTOLAYOUT_HANDOUT3},
+ {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
+ {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
+ {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
+ {0, 0, AUTOLAYOUT_NONE},
};
static const snewfoil_value_info standard[] =
{
- {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE,
WritingMode_LR_TB, AUTOLAYOUT_NONE },
- {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE,
WritingMode_LR_TB, AUTOLAYOUT_TITLE },
- {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_ENUM },
- {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_2TEXT },
- {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE,
WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE },
- {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT,
WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT },
- {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT },
- {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ },
- {BMP_LAYOUT_HEAD03A,
STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT
},
- {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT },
- {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_4OBJ },
- {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT,
WritingMode_LR_TB, AUTOLAYOUT_6CLIPART },
- {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+ {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE
},
+ {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE,
AUTOLAYOUT_TITLE },
+ {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_ENUM
},
+ {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT,
AUTOLAYOUT_2TEXT },
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE,
AUTOLAYOUT_ONLY_TITLE },
+ {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT,
AUTOLAYOUT_ONLY_TEXT },
+ {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT,
AUTOLAYOUT_2OBJTEXT },
+ {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT,
AUTOLAYOUT_TEXT2OBJ },
+ {BMP_LAYOUT_HEAD03A,
STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT },
+ {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT,
AUTOLAYOUT_OBJOVERTEXT },
+ {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ
},
+ {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT,
AUTOLAYOUT_6CLIPART },
+ {0, 0, AUTOLAYOUT_NONE}
};
static const snewfoil_value_info v_standard[] =
{
// vertical
- {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,
WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART },
- {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,
WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
- {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE,
WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE },
- {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,
WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART },
- {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+ {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,
AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART },
+ {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,
AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
+ {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE,
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE },
+ {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART },
+ {0, 0, AUTOLAYOUT_NONE}
};
static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info*
pInfo )
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx
b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 12662af..8a9094c 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -53,9 +53,7 @@ NavigatorChildWindow::NavigatorChildWindow (
: SfxChildWindowContext( nId )
{
VclPtr<SdNavigatorWin> pNavWin = VclPtr<SdNavigatorWin>::Create(
-
pParent,
- this,
SdResId( FLT_NAVIGATOR ),
pBindings);
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx
b/sd/source/ui/dlg/TemplateScanner.cxx
index 7f96cb3..33dcc56 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -62,18 +62,15 @@ public:
FolderDescriptor (
int nPriority,
const OUString& rsTitle,
- const OUString& rsTargetDir,
const OUString& rsContentIdentifier,
const Reference<css::ucb::XCommandEnvironment>& rxFolderEnvironment)
: mnPriority(nPriority),
msTitle(rsTitle),
- msTargetDir(rsTargetDir),
msContentIdentifier(rsContentIdentifier),
mxFolderEnvironment(rxFolderEnvironment)
{ }
int mnPriority;
OUString msTitle;
- OUString msTargetDir;
OUString msContentIdentifier;
// Reference<sdbc::XResultSet> mxFolderResultSet;
Reference<css::ucb::XCommandEnvironment> mxFolderEnvironment;
@@ -340,7 +337,6 @@ TemplateScanner::State TemplateScanner::GatherFolderList()
FolderDescriptor(
Classify(sTitle,sTargetDir),
sTitle,
- sTargetDir,
aId,
mxFolderEnvironment));
}
@@ -362,7 +358,6 @@ TemplateScanner::State TemplateScanner::ScanFolder()
mpFolderDescriptors->erase(mpFolderDescriptors->begin());
OUString sTitle (aDescriptor.msTitle);
- OUString sTargetDir (aDescriptor.msTargetDir);
OUString aId (aDescriptor.msContentIdentifier);
maFolderContent = ::ucbhelper::Content (aId,
aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext());
@@ -370,7 +365,7 @@ TemplateScanner::State TemplateScanner::ScanFolder()
{
// Scan the folder and insert it into the list of template
// folders.
- mpTemplateDirectory = new TemplateDir (sTitle, sTargetDir);
+ mpTemplateDirectory = new TemplateDir (sTitle);
mpTemplateDirectory->EnableSorting(mbEntrySortingEnabled);
// Continue with scanning all entries in the folder.
eNextState = INITIALIZE_ENTRY_SCAN;
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 7df30fa..7e25a5a 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -74,7 +74,7 @@ VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin)
}
SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle )
-: Control(pParent, nStyle), pMetaFile( nullptr ), bInEffect(false),
mpObj(nullptr), mnShowPage(0)
+: Control(pParent, nStyle), pMetaFile( nullptr ), mpObj(nullptr), mnShowPage(0)
{
SetBorderStyle( WindowBorderStyle::MONO );
svtools::ColorConfig aColorConfig;
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 0b763ab..0617324 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -65,14 +65,12 @@ static const sal_uInt16 nShowAllShapesFilter=2;
*/
SdNavigatorWin::SdNavigatorWin(
vcl::Window* pParent,
- ::sd::NavigatorChildWindow* pChWinCtxt,
const SdResId& rSdResId,
SfxBindings* pInBindings)
: vcl::Window( pParent, rSdResId )
, maToolbox ( VclPtr<ToolBox>::Create( this, SdResId( 1 ) ) )
, maTlbObjects( VclPtr<SdPageObjsTLB>::Create( this, SdResId( TLB_OBJECTS
) ) )
, maLbDocs ( VclPtr<ListBox>::Create( this, SdResId( LB_DOCS ) ) )
- , mpChildWinContext( pChWinCtxt )
, mbDocImported ( false )
// On changes of the DragType: adjust SelectionMode of TLB!
, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED )
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index f0f9ab2..41e9bfb 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -29,8 +29,7 @@
* dialog to adjust print options
*/
SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet&
rInAttrs ) :
- SfxTabPage ( pParent, "prntopts" ,
"modules/simpress/ui/prntopts.ui" , &rInAttrs ),
- rOutAttrs ( rInAttrs )
+ SfxTabPage ( pParent, "prntopts" ,
"modules/simpress/ui/prntopts.ui" , &rInAttrs )
{
get( m_pFrmContent , "contentframe" );
get( m_pCbxDraw , "drawingcb" );
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index ff3d2f1..9bdb6bb 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -68,8 +68,6 @@ public:
*/
css::uno::Reference<css::drawing::framework::XConfiguration>
mxRequestedConfiguration;
- ViewShellBase* mpBase;
-
std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
@@ -550,7 +548,6 @@ ConfigurationController::Implementation::Implementation (
: mxControllerManager(rxController, UNO_QUERY_THROW),
mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)),
mxRequestedConfiguration(new Configuration(&rController, true)),
- mpBase(nullptr),
mpResourceFactoryContainer(new
ResourceFactoryManager(mxControllerManager)),
mpResourceManager(
new
ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx
b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 30855b6..43c3ab6 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -84,7 +84,6 @@ public:
protected:
SdrPaintView* mpView;
sal_uInt16 mnWindowId;
- OutputDevice& mrDevice;
private:
AccessibleViewForwarder (AccessibleViewForwarder&) = delete;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx
b/sd/source/ui/inc/EventMultiplexer.hxx
index 112f27b..541f7e5 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -128,12 +128,10 @@ public:
*/
static const EventId EID_EDIT_MODE_MASTER = 0x00080000;
- const ViewShellBase& mrBase;
EventId meEventId;
const void* mpUserData;
EventMultiplexerEvent (
- const ViewShellBase& rBase,
EventId eEventId,
const void* pUserData);
};
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx
b/sd/source/ui/inc/GraphicObjectBar.hxx
index cee27ab..2bce18b 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -52,7 +52,6 @@ public:
protected:
::sd::View* mpView;
ViewShell* mpViewSh;
- sal_uInt16 nMappedSlotFilter;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx
b/sd/source/ui/inc/MasterPageObserver.hxx
index 55f603f..561b52b 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -103,15 +103,12 @@ public:
};
EventType meType;
- SdDrawDocument& mrDocument;
const OUString& mrMasterPageName;
MasterPageObserverEvent (
EventType eType,
- SdDrawDocument& rDocument,
const OUString& rMasterPageName)
: meType(eType),
- mrDocument(rDocument),
mrMasterPageName(rMasterPageName)
{}
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 311360c..48fd1f6 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -130,7 +130,6 @@ public:
sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override;
virtual sal_Int8 ExecuteDrop (
const ExecuteDropEvent& rEvt,
- DropTargetHelper& rTargetHelper,
::sd::Window* pTargetWindow = nullptr,
sal_uInt16 nPage = SDRPAGE_NOTFOUND,
sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override;
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index 102dc77..38d0d77 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -49,7 +49,6 @@ public:
using ::Ruler::SetNullOffset;
protected:
- ::sd::View* pSdView;
VclPtr< ::sd::Window> pSdWin;
DrawViewShell* pDrViewShell;
RulerCtrlItem* pCtrlItem;
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 880612c..6890178 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -221,7 +221,6 @@ private:
ViewShell* mpViewShell;
ViewShellBase* mpViewShellBase;
VclPtr<sd::Window> mpContentWindow;
- bool mbOwnesContentWindow;
VclPtr<ScrollBar> mpHorizontalScrollBar;
VclPtr<ScrollBar> mpVerticalScrollBar;
VclPtr<ScrollBarBox> mpScrollBarBox;
diff --git a/sd/source/ui/inc/TemplateScanner.hxx
b/sd/source/ui/inc/TemplateScanner.hxx
index 17f40d7..6497848 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -72,12 +72,11 @@ private:
class TemplateDir
{
public:
- TemplateDir (const OUString& rsRegion, const OUString& rsUrl )
- : msRegion(rsRegion), msUrl(rsUrl), maEntries(),
+ TemplateDir (const OUString& rsRegion )
+ : msRegion(rsRegion), maEntries(),
mbSortingEnabled(false), mpEntryCompare(nullptr) {}
OUString msRegion;
- OUString msUrl;
::std::vector<TemplateEntry*> maEntries;
void EnableSorting(bool bSortingEnabled = true);
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 935ba07..5c9aef6 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -105,7 +105,6 @@ public:
sal_uInt16 nLayer = SDRPAGE_NOTFOUND);
virtual sal_Int8 ExecuteDrop (
const ExecuteDropEvent& rEvt,
- DropTargetHelper& rTargetHelper,
::sd::Window* pTargetWindow = nullptr,
sal_uInt16 nPage = SDRPAGE_NOTFOUND,
sal_uInt16 nLayer = SDRPAGE_NOTFOUND);
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 2aa190b..74f8aa8 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -164,7 +164,6 @@ protected:
bool mbCalcMinZoomByMinSide;
bool mbCenterAllowed;
long mnTicks;
- bool mbDraggedFrom;
ViewShell* mpViewShell;
bool mbUseDropScroll;
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 5df4aab..faf1e7b 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -42,7 +42,6 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public
SfxListener
{
protected:
GDIMetaFile* pMetaFile;
- bool bInEffect;
Link<SdDocPreviewWin&,void> aClickHdl;
SfxObjectShell* mpObj;
sal_uInt16 mnShowPage;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
