summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/inc/mediacontrol.hxx8
-rw-r--r--avmedia/source/framework/mediacontrol.cxx22
-rw-r--r--avmedia/source/framework/mediaitem.cxx38
-rw-r--r--avmedia/source/framework/mediamisc.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx17
-rw-r--r--avmedia/source/framework/mediatoolbox.cxx21
-rw-r--r--avmedia/source/framework/modeltools.cxx8
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx5
-rw-r--r--avmedia/source/gstreamer/gstmanager.hxx4
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx43
-rw-r--r--avmedia/source/gstreamer/gstplayer.hxx3
-rw-r--r--avmedia/source/gstreamer/gstwindow.hxx4
-rw-r--r--avmedia/source/macavf/framegrabber.hxx4
-rw-r--r--avmedia/source/macavf/framegrabber.mm11
-rw-r--r--avmedia/source/macavf/manager.hxx3
-rw-r--r--avmedia/source/macavf/manager.mm9
-rw-r--r--avmedia/source/macavf/player.hxx6
-rw-r--r--avmedia/source/macavf/player.mm27
-rw-r--r--avmedia/source/macavf/window.hxx7
-rw-r--r--avmedia/source/macavf/window.mm33
-rw-r--r--avmedia/source/quicktime/framegrabber.hxx4
-rw-r--r--avmedia/source/quicktime/framegrabber.mm9
-rw-r--r--avmedia/source/quicktime/manager.hxx3
-rw-r--r--avmedia/source/quicktime/manager.mm8
-rw-r--r--avmedia/source/quicktime/player.hxx6
-rw-r--r--avmedia/source/quicktime/player.mm26
-rw-r--r--avmedia/source/quicktime/window.hxx4
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx29
-rw-r--r--avmedia/source/viewer/mediawindow.cxx58
-rw-r--r--avmedia/source/win/framegrabber.cxx10
-rw-r--r--avmedia/source/win/framegrabber.hxx4
-rw-r--r--avmedia/source/win/manager.cxx8
-rw-r--r--avmedia/source/win/manager.hxx3
-rw-r--r--avmedia/source/win/player.cxx27
-rw-r--r--avmedia/source/win/player.hxx5
-rw-r--r--avmedia/source/win/window.hxx5
-rw-r--r--bridges/source/cpp_uno/gcc3_ios_arm/rtti.h274
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.hxx2
-rw-r--r--connectivity/source/parse/sqlflex.l3
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx84
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx64
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx8
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx31
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx6
-rw-r--r--editeng/source/items/frmitems.cxx190
-rw-r--r--editeng/source/rtf/svxrtf.cxx14
-rw-r--r--extensions/source/macosx/spotlight/main.m20
-rw-r--r--extensions/source/scanner/sane.hxx10
-rw-r--r--extensions/source/scanner/scanner.cxx11
-rw-r--r--extensions/source/scanner/scanunx.cxx24
-rw-r--r--filter/source/flash/impswfdialog.cxx9
-rw-r--r--filter/source/flash/impswfdialog.hxx4
-rw-r--r--filter/source/flash/swfdialog.cxx26
-rw-r--r--filter/source/flash/swfdialog.hxx7
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx27
-rw-r--r--filter/source/graphicfilter/egif/giflzwc.cxx29
-rw-r--r--filter/source/graphicfilter/egif/giflzwc.hxx4
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx31
-rw-r--r--filter/source/pdf/impdialog.cxx156
-rw-r--r--filter/source/pdf/impdialog.hxx518
-rw-r--r--filter/source/pdf/pdfdialog.cxx8
-rw-r--r--filter/source/pdf/pdfdialog.hxx17
-rw-r--r--filter/source/pdf/pdfexport.cxx233
-rw-r--r--filter/source/pdf/pdfexport.hxx76
-rw-r--r--filter/source/pdf/pdffilter.cxx34
-rw-r--r--filter/source/pdf/pdffilter.hxx16
-rw-r--r--filter/source/pdf/pdfinteract.cxx11
-rw-r--r--filter/source/pdf/pdfinteract.hxx15
-rw-r--r--filter/source/svg/impsvgdialog.cxx10
-rw-r--r--filter/source/svg/impsvgdialog.hxx12
-rw-r--r--filter/source/svg/svgdialog.cxx21
-rw-r--r--filter/source/svg/svgdialog.hxx9
-rw-r--r--filter/source/svg/svgexport.cxx147
-rw-r--r--filter/source/svg/svgfontexport.cxx13
-rw-r--r--filter/source/svg/svgfontexport.hxx16
-rw-r--r--filter/source/svg/svgwriter.cxx136
-rw-r--r--filter/source/svg/svgwriter.hxx20
-rw-r--r--forms/source/component/imgprod.cxx28
-rw-r--r--forms/source/component/imgprod.hxx13
-rw-r--r--hwpfilter/source/hwpfile.cxx60
-rw-r--r--idlc/source/idlccompile.cxx8
-rw-r--r--include/avmedia/modeltools.hxx2
-rw-r--r--include/helpcompiler/HelpIndexer.hxx60
-rw-r--r--include/helpcompiler/HelpSearch.hxx24
-rw-r--r--include/i18nutil/paper.hxx3
-rw-r--r--include/sfx2/printopt.hxx3
-rw-r--r--include/svl/svdde.hxx46
-rw-r--r--include/svtools/brwbox.hxx30
-rw-r--r--include/svtools/calendar.hxx17
-rw-r--r--include/svtools/colrdlg.hxx4
-rw-r--r--include/svtools/headbar.hxx18
-rw-r--r--include/svtools/printoptions.hxx12
-rw-r--r--include/svtools/prnsetup.hxx6
-rw-r--r--include/svtools/ruler.hxx13
-rw-r--r--include/svtools/scrwin.hxx12
-rw-r--r--include/svtools/tabbar.hxx16
-rw-r--r--include/svtools/valueset.hxx3
-rw-r--r--include/svtools/wizdlg.hxx7
-rw-r--r--include/svx/gallery1.hxx10
-rw-r--r--include/svx/galtheme.hxx12
-rw-r--r--include/svx/grafctrl.hxx34
-rw-r--r--include/svx/msdffdef.hxx205
-rw-r--r--include/svx/svdomedia.hxx3
-rw-r--r--include/svx/xmleohlp.hxx19
-rw-r--r--include/test/util/xreplaceable.hxx4
-rw-r--r--include/unotest/bootstrapfixturebase.hxx4
-rw-r--r--include/unotools/fontcvt.hxx23
-rw-r--r--include/unotools/fontdefs.hxx9
-rw-r--r--include/vcl/bitmapaccess.hxx36
-rw-r--r--include/vcl/button.hxx30
-rw-r--r--include/vcl/commandevent.hxx51
-rw-r--r--include/vcl/ctrl.hxx1
-rw-r--r--include/vcl/cvtgrf.hxx1
-rw-r--r--include/vcl/dialog.hxx3
-rw-r--r--include/vcl/dockwin.hxx1
-rw-r--r--include/vcl/edit.hxx2
-rw-r--r--include/vcl/event.hxx6
-rw-r--r--include/vcl/field.hxx19
-rw-r--r--include/vcl/fixed.hxx4
-rw-r--r--include/vcl/floatwin.hxx2
-rw-r--r--include/vcl/gdimtf.hxx2
-rw-r--r--include/vcl/gfxlink.hxx5
-rw-r--r--include/vcl/gradient.hxx2
-rw-r--r--include/vcl/graphicfilter.hxx1
-rw-r--r--include/vcl/group.hxx1
-rw-r--r--include/vcl/hatch.hxx2
-rw-r--r--include/vcl/help.hxx2
-rw-r--r--include/vcl/imgctrl.hxx1
-rw-r--r--include/vcl/inputctx.hxx2
-rw-r--r--include/vcl/lineinfo.hxx2
-rw-r--r--include/vcl/longcurr.hxx3
-rw-r--r--include/vcl/mapmod.hxx1
-rw-r--r--include/vcl/mnemonic.hxx2
-rw-r--r--include/vcl/morebtn.hxx1
-rw-r--r--include/vcl/prgsbar.hxx2
-rw-r--r--include/vcl/prntypes.hxx4
-rw-r--r--include/vcl/salbtype.hxx8
-rw-r--r--include/vcl/scrbar.hxx3
-rw-r--r--include/vcl/seleng.hxx2
-rw-r--r--include/vcl/settings.hxx5
-rw-r--r--include/vcl/sound.hxx1
-rw-r--r--include/vcl/spin.hxx1
-rw-r--r--include/vcl/status.hxx5
-rw-r--r--include/vcl/syswin.hxx4
-rw-r--r--include/vcl/tabpage.hxx1
-rw-r--r--include/vcl/window.hxx2
-rw-r--r--include/vcl/wrkwin.hxx2
-rw-r--r--include/xmloff/settingsstore.hxx4
-rw-r--r--include/xmloff/unointerfacetouniqueidentifiermapper.hxx2
-rw-r--r--include/xmloff/xmltypes.hxx2
-rw-r--r--include/xmloff/xmluconv.hxx2
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/MyJob.cxx2
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx16
-rw-r--r--onlineupdate/source/update/inc/nsWindowsHelpers.h2
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx1
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx1
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx1
-rw-r--r--sc/qa/unit/ucalc_formula.cxx1
-rw-r--r--sc/source/filter/inc/lotfntbf.hxx4
-rw-r--r--sc/source/filter/inc/tokstack.hxx12
-rw-r--r--sc/source/filter/lotus/filter.cxx2
-rw-r--r--sc/source/filter/lotus/lotattr.cxx4
-rw-r--r--sc/source/filter/lotus/lotread.cxx2
-rw-r--r--sc/source/filter/oox/worksheetfragment.cxx2
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx7
-rw-r--r--sc/source/ui/condformat/condformatmgr.cxx1
-rw-r--r--sc/source/ui/docshell/docsh6.cxx8
-rw-r--r--sc/source/ui/undo/undoblk3.cxx4
-rw-r--r--sc/source/ui/unoobj/appluno.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx28
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx2
-rw-r--r--scaddins/source/analysis/analysishelper.cxx26
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx1
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx1
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx1
-rw-r--r--sd/source/filter/ppt/pptanimations.hxx2
-rw-r--r--sd/source/filter/sdfilter.cxx2
-rw-r--r--sd/source/filter/sdpptwrp.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx1
-rw-r--r--sd/source/ui/app/optsitem.cxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx1
-rw-r--r--sd/source/ui/docshell/sdclient.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx2
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx1
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx1
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx1
-rw-r--r--sd/source/ui/view/drviewsa.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx1
-rw-r--r--sd/source/ui/view/sdview3.cxx1
-rw-r--r--sd/source/ui/view/tabcontr.cxx1
-rw-r--r--sdext/source/minimizer/graphiccollector.hxx1
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx1
-rw-r--r--sdext/source/minimizer/impoptimizer.hxx1
-rw-r--r--sdext/source/minimizer/informationdialog.cxx1
-rw-r--r--sdext/source/minimizer/informationdialog.hxx1
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx1
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx1
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx1
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx1
-rw-r--r--sdext/source/minimizer/pppoptimizer.hxx1
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.hxx1
-rw-r--r--sdext/source/minimizer/unodialog.cxx1
-rw-r--r--sdext/source/minimizer/unodialog.hxx1
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx2
-rw-r--r--sfx2/source/dialog/bluthsnd.cxx2
-rw-r--r--svl/source/svdde/ddeimp.hxx4
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx2
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx3
-rw-r--r--svtools/source/control/valueacc.cxx3
-rw-r--r--svtools/source/dialogs/colrdlg.cxx1
-rw-r--r--svtools/source/graphic/descriptor.cxx1
-rw-r--r--svtools/source/graphic/grfattr.cxx1
-rw-r--r--svtools/source/graphic/grfcache.hxx1
-rw-r--r--svtools/source/graphic/grfmgr2.cxx2
-rw-r--r--svtools/source/graphic/transformer.cxx1
-rw-r--r--svtools/source/graphic/transformer.hxx1
-rw-r--r--svtools/source/misc/transfer.cxx7
-rw-r--r--svtools/source/misc/transfer2.cxx5
-rw-r--r--svx/inc/galbrws2.hxx5
-rw-r--r--svx/source/accessibility/charmapacc.cxx4
-rw-r--r--svx/source/dialog/grfflt.cxx1
-rw-r--r--svx/source/dialog/imapimp.hxx1
-rw-r--r--svx/source/gallery2/codec.cxx1
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx3
-rw-r--r--svx/source/gallery2/galexpl.cxx1
-rw-r--r--svx/source/gallery2/gallery1.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx1
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.cxx1
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.hxx1
-rw-r--r--svx/source/svdraw/svdibrow.cxx3
-rw-r--r--svx/source/svdraw/svdomedia.cxx1
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx1
-rw-r--r--svx/source/unodraw/unoshap4.cxx6
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.hxx2
-rw-r--r--svx/source/unogallery/unogaltheme.cxx1
-rw-r--r--svx/source/unogallery/unogaltheme.hxx1
-rw-r--r--sw/inc/modcfg.hxx4
-rw-r--r--sw/source/core/doc/doccomp.cxx2
-rw-r--r--sw/source/uibase/config/modcfg.cxx6
-rw-r--r--tubes/source/manager.cxx4
-rw-r--r--vcl/inc/PhysicalFontCollection.hxx1
-rw-r--r--vcl/inc/PhysicalFontFace.hxx1
-rw-r--r--vcl/inc/osx/a11yfocustracker.hxx1
-rw-r--r--vcl/inc/osx/a11ylistener.hxx1
-rw-r--r--vcl/inc/osx/keyboardfocuslistener.hxx1
-rw-r--r--vcl/inc/osx/salframe.h1
-rw-r--r--vcl/inc/osx/salobj.h1
-rw-r--r--vcl/inc/osx/salprn.h2
-rw-r--r--vcl/inc/osx/salsys.h1
-rw-r--r--vcl/inc/quartz/salbmp.h1
-rw-r--r--vcl/inc/quartz/salgdi.h2
-rw-r--r--vcl/inc/unx/salbmp.h3
-rw-r--r--vcl/inc/win/salbmp.h1
-rw-r--r--vcl/inc/win/salframe.h1
-rw-r--r--vcl/inc/win/salobj.h1
-rw-r--r--vcl/inc/win/salprn.h3
-rw-r--r--vcl/inc/win/salvd.h1
-rw-r--r--vcl/inc/win/wincomp.hxx3
-rw-r--r--vcl/osx/documentfocuslistener.hxx1
-rw-r--r--vcl/qa/cppunit/timer.cxx5
-rw-r--r--vcl/source/filter/ixpm/xpmread.cxx1
-rw-r--r--vcl/source/gdi/dibtools.cxx1
-rw-r--r--vcl/source/gdi/impvect.hxx1
-rw-r--r--vcl/source/gdi/lineinfo.cxx2
-rw-r--r--vcl/source/gdi/mapmod.cxx1
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx1
-rw-r--r--vcl/source/window/brdwin.cxx4
-rw-r--r--vcl/source/window/menu.cxx1
-rw-r--r--vcl/unx/generic/app/gendisp.cxx6
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx3
-rw-r--r--vcl/win/gdi/salbmp.cxx2
-rw-r--r--vcl/win/gdi/salfont.cxx1
-rw-r--r--vcl/win/gdi/salprn.cxx5
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx10
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx8
-rw-r--r--xmloff/source/core/XMLBase64Export.cxx2
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx4
-rw-r--r--xmloff/source/draw/animexp.cxx2
-rw-r--r--xmloff/source/text/txtprmap.cxx8
286 files changed, 1594 insertions, 2547 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index da17bc8e451c..1139f985209f 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -37,9 +37,6 @@ namespace avmedia
{
-// - MediaControlStyle -
-
-
enum MediaControlStyle
{
MEDIACONTROLSTYLE_SINGLELINE = 0,
@@ -47,9 +44,6 @@ enum MediaControlStyle
};
-// - MediaControl -
-
-
class MediaItem;
class MediaControl : public Control
@@ -103,6 +97,6 @@ private:
}
-#endif
+#endif // INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 8d542290fb13..8728fdff8b42 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -57,10 +57,6 @@
namespace avmedia
{
-
-// - MediaControl -
-
-
MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) :
Control( pParent ),
maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
@@ -192,12 +188,12 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
}
-
MediaControl::~MediaControl()
{
disposeOnce();
}
+
void MediaControl::dispose()
{
maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, nullptr );
@@ -212,14 +208,12 @@ void MediaControl::dispose()
}
-
const Size& MediaControl::getMinSizePixel() const
{
return maMinSize;
}
-
void MediaControl::Resize()
{
Point aPos( 0, 0 );
@@ -277,7 +271,6 @@ void MediaControl::Resize()
}
-
void MediaControl::setState( const MediaItem& rItem )
{
if( !mbLocked )
@@ -292,7 +285,6 @@ void MediaControl::setState( const MediaItem& rItem )
}
-
void MediaControl::implUpdateToolboxes()
{
const bool bValidURL = !maItem.getURL().isEmpty();
@@ -367,7 +359,6 @@ void MediaControl::implUpdateToolboxes()
}
-
void MediaControl::implUpdateTimeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -394,7 +385,6 @@ void MediaControl::implUpdateTimeSlider()
}
-
void MediaControl::implUpdateVolumeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -411,7 +401,6 @@ void MediaControl::implUpdateVolumeSlider()
}
-
void MediaControl::implUpdateTimeField( double fCurTime )
{
if( !maItem.getURL().isEmpty() )
@@ -431,14 +420,12 @@ void MediaControl::implUpdateTimeField( double fCurTime )
}
-
Image MediaControl::implGetImage( sal_Int32 nImageId ) const
{
return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
}
-
IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
{
mbLocked = true;
@@ -447,7 +434,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -460,7 +446,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -471,7 +456,6 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
{
if( p )
@@ -559,7 +543,6 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
{
MediaItem aExecItem;
@@ -582,12 +565,11 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
-
IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
{
update();
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7a8b9a6c4ccb..ed413f23a363 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-// - MediaItem -
SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
struct MediaItem::Impl
@@ -89,22 +88,26 @@ struct MediaItem::Impl
}
};
+
MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet )
: SfxPoolItem( i_nWhich )
, m_pImpl( new Impl(nMaskSet) )
{
}
+
MediaItem::MediaItem( const MediaItem& rItem )
: SfxPoolItem( rItem )
, m_pImpl( new Impl(*rItem.m_pImpl) )
{
}
+
MediaItem::~MediaItem()
{
}
+
bool MediaItem::operator==( const SfxPoolItem& rItem ) const
{
assert( SfxPoolItem::operator==(rItem));
@@ -122,11 +125,13 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
&& m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
}
+
SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
{
return new MediaItem( *this );
}
+
bool MediaItem::GetPresentation( SfxItemPresentation,
SfxMapUnit,
SfxMapUnit,
@@ -137,6 +142,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
return false;
}
+
bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
uno::Sequence< uno::Any > aSeq( 10 );
@@ -157,6 +163,7 @@ bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
return true;
}
+
bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
{
uno::Sequence< uno::Any > aSeq;
@@ -185,6 +192,7 @@ bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
return bRet;
}
+
void MediaItem::merge( const MediaItem& rMediaItem )
{
const AVMediaSetMask nMaskSet = rMediaItem.getMaskSet();
@@ -217,11 +225,13 @@ void MediaItem::merge( const MediaItem& rMediaItem )
setZoom( rMediaItem.getZoom() );
}
+
AVMediaSetMask MediaItem::getMaskSet() const
{
return m_pImpl->m_nMaskSet;
}
+
void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::URL;
@@ -230,109 +240,129 @@ void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OU
m_pImpl->m_Referer = rReferer;
}
+
const OUString& MediaItem::getURL() const
{
return m_pImpl->m_URL;
}
+
const OUString& MediaItem::getTempURL() const
{
return m_pImpl->m_TempFileURL;
}
+
const OUString& MediaItem::getReferer() const
{
return m_pImpl->m_Referer;
}
+
void MediaItem::setMimeType( const OUString& rMimeType )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::MIME_TYPE;
m_pImpl->m_sMimeType = rMimeType;
}
+
OUString MediaItem::getMimeType() const
{
return !m_pImpl->m_sMimeType.isEmpty() ? m_pImpl->m_sMimeType : AVMEDIA_MIMETYPE_COMMON;
}
+
void MediaItem::setState( MediaState eState )
{
m_pImpl->m_eState = eState;
m_pImpl->m_nMaskSet |= AVMediaSetMask::STATE;
}
+
MediaState MediaItem::getState() const
{
return m_pImpl->m_eState;
}
+
void MediaItem::setDuration( double fDuration )
{
m_pImpl->m_fDuration = fDuration;
m_pImpl->m_nMaskSet |= AVMediaSetMask::DURATION;
}
+
double MediaItem::getDuration() const
{
return m_pImpl->m_fDuration;
}
+
void MediaItem::setTime( double fTime )
{
m_pImpl->m_fTime = fTime;
m_pImpl->m_nMaskSet |= AVMediaSetMask::TIME;
}
+
double MediaItem::getTime() const
{
return m_pImpl->m_fTime;
}
+
void MediaItem::setLoop( bool bLoop )
{
m_pImpl->m_bLoop = bLoop;
m_pImpl->m_nMaskSet |= AVMediaSetMask::LOOP;
}
+
bool MediaItem::isLoop() const
{
return m_pImpl->m_bLoop;
}
+
void MediaItem::setMute( bool bMute )
{
m_pImpl->m_bMute = bMute;
m_pImpl->m_nMaskSet |= AVMediaSetMask::MUTE;
}
+
bool MediaItem::isMute() const
{
return m_pImpl->m_bMute;
}
+
void MediaItem::setVolumeDB( sal_Int16 nDB )
{
m_pImpl->m_nVolumeDB = nDB;
m_pImpl->m_nMaskSet |= AVMediaSetMask::VOLUMEDB;
}
+
sal_Int16 MediaItem::getVolumeDB() const
{
return m_pImpl->m_nVolumeDB;
}
+
void MediaItem::setZoom( css::media::ZoomLevel eZoom )
{
m_pImpl->m_eZoom = eZoom;
m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
}
+
css::media::ZoomLevel MediaItem::getZoom() const
{
return m_pImpl->m_eZoom;
}
+
OUString GetFilename(OUString const& rSourceURL)
{
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
@@ -357,6 +387,7 @@ OUString GetFilename(OUString const& rSourceURL)
return filename;
}
+
uno::Reference<io::XStream>
CreateStream(uno::Reference<embed::XStorage> const& xStorage,
OUString const& rFilename)
@@ -399,6 +430,7 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage,
return xStream;
}
+
bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
OUString const& rSourceURL, OUString & o_rEmbeddedURL)
{
@@ -451,6 +483,8 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
}
return false;
}
-}
+
+
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 6733313ed318..af9ce1b48b4e 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -38,6 +38,6 @@ ResMgr* GetResMgr()
return pResMgr;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index c39af428e92e..489ff5e05f0a 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -33,10 +33,6 @@
namespace avmedia
{
-
-// - MediaPlayer -
-
-
MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
@@ -45,19 +41,14 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p
};
-
MediaPlayer::~MediaPlayer()
{
}
-
SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
-// - MediaFloater -
-
-
MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
mpMediaWindow( new MediaWindow( this, true ) )
@@ -71,12 +62,12 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
}
-
MediaFloater::~MediaFloater()
{
disposeOnce();
}
+
void MediaFloater::dispose()
{
delete mpMediaWindow;
@@ -85,7 +76,6 @@ void MediaFloater::dispose()
}
-
void MediaFloater::Resize()
{
SfxDockingWindow::Resize();
@@ -95,7 +85,6 @@ void MediaFloater::Resize()
}
-
void MediaFloater::ToggleFloatingMode()
{
::avmedia::MediaItem aRestoreItem;
@@ -124,7 +113,6 @@ void MediaFloater::ToggleFloatingMode()
}
-
void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
{
if( mpMediaWindow )
@@ -137,7 +125,6 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool
}
-
void MediaFloater::dispatchCurrentURL()
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
@@ -153,6 +140,6 @@ void MediaFloater::dispatchCurrentURL()
}
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 14d6befd7c8a..08d1f9fa7e43 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -33,10 +33,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-
-// - MediaToolboxControl -
-
-
class MediaToolBoxControl_Impl : public MediaControl
{
public:
@@ -52,7 +48,6 @@ private:
};
-
MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) :
MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
mpToolBoxControl( &rControl )
@@ -61,27 +56,21 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaT
}
-
void MediaToolBoxControl_Impl::update()
{
mpToolBoxControl->implUpdateMediaControl();
}
-
void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
{
mpToolBoxControl->implExecuteMediaControl( rItem );
}
-// - MediaToolBoxControl -
-
-
SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
-
MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
@@ -89,15 +78,12 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To
}
-
MediaToolBoxControl::~MediaToolBoxControl()
{
}
-
-void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
-
+void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
@@ -123,21 +109,18 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
}
-
VclPtr<vcl::Window> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return ( pParent ? VclPtr<MediaToolBoxControl_Impl>::Create( *pParent, *this ) : nullptr );
}
-
void MediaToolBoxControl::implUpdateMediaControl()
{
updateStatus( ".uno:AVMediaToolBox" );
}
-
void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
{
MediaItem aExecItem( SID_AVMEDIA_TOOLBOX );
@@ -152,6 +135,6 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
Dispatch( ".uno:AVMediaToolBox" , aArgs );
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 4d348c343ac0..74669af81258 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -66,6 +66,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
}
}
+
bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
{
o_rOutput.clear();
@@ -133,7 +134,8 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
o_rOutput = sOutput + "/" + GetFilename(sOutput) + ".json";
return true;
}
-#endif
+#endif // HAVE_FEATURE_COLLADA
+
static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed::XStorage> xSubStorage, ::ucbhelper::Content& rContent)
{
@@ -237,6 +239,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
}
}
+
bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
const OUString& rSourceURL, OUString& o_rEmbeddedURL)
{
@@ -311,11 +314,12 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
return false;
}
+
bool IsModel(const OUString& rMimeType)
{
return rMimeType == AVMEDIA_MIMETYPE_JSON;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 4939d4ed1863..af181385ece7 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -27,13 +27,10 @@
namespace avmedia { namespace gstreamer {
-
-// - FrameGrabber -
-
-
typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo > FrameGrabber_BASE;
+
class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{
GstElement *mpPipeline;
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 8dc1a954ccac..48a07f645f90 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -24,10 +24,6 @@
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp"
-
-// - Manager -
-
-
namespace avmedia { namespace gstreamer {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index fef123fd2553..d77944e98dfa 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -83,6 +83,7 @@ private:
void execute() override;
};
+
class MissingPluginInstaller {
friend class MissingPluginInstallerThread;
@@ -113,12 +114,14 @@ private:
bool inCleanUp_;
};
+
MissingPluginInstaller::~MissingPluginInstaller() {
osl::MutexGuard g(mutex_);
SAL_WARN_IF(currentThread_.is(), "avmedia.gstreamer", "unjoined thread");
inCleanUp_ = true;
}
+
void MissingPluginInstaller::report(
rtl::Reference<Player> const & source, GstMessage * message)
{
@@ -169,6 +172,7 @@ void MissingPluginInstaller::report(
LINK(this, MissingPluginInstaller, launchUi), launch.get());
}
+
void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
{
auto i = std::find_if(
@@ -181,6 +185,7 @@ void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
}
}
+
void MissingPluginInstaller::detach(Player const * source) {
rtl::Reference<MissingPluginInstallerThread> join;
{
@@ -217,6 +222,7 @@ void MissingPluginInstaller::detach(Player const * source) {
}
}
+
void MissingPluginInstaller::processQueue() {
assert(!queued_.empty());
assert(currentDetails_.empty());
@@ -228,6 +234,7 @@ void MissingPluginInstaller::processQueue() {
queued_.clear();
}
+
IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
{
MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p);
@@ -243,10 +250,12 @@ IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
ref->launch();
}
+
struct TheMissingPluginInstaller:
public rtl::Static<MissingPluginInstaller, TheMissingPluginInstaller>
{};
+
void MissingPluginInstallerThread::execute() {
MissingPluginInstaller & inst = TheMissingPluginInstaller::get();
for (;;) {
@@ -273,9 +282,7 @@ void MissingPluginInstallerThread::execute() {
}
}
-}
-
-// - Player -
+} // end anonymous namespace
Player::Player() :
@@ -315,7 +322,6 @@ Player::Player() :
}
-
Player::~Player()
{
SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " Player::~Player" );
@@ -323,6 +329,7 @@ Player::~Player()
disposing();
}
+
void SAL_CALL Player::disposing()
{
TheMissingPluginInstaller::get().detach(this);
@@ -357,6 +364,7 @@ void SAL_CALL Player::disposing()
}
}
+
static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
{
Player* pPlayer = static_cast<Player*>(data);
@@ -366,6 +374,7 @@ static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer d
return TRUE;
}
+
static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data )
{
Player* pPlayer = static_cast<Player*>(data);
@@ -373,6 +382,7 @@ static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message
return pPlayer->processSyncMessage( message );
}
+
void Player::processMessage( GstMessage *message )
{
switch( GST_MESSAGE_TYPE( message ) ) {
@@ -401,6 +411,7 @@ void Player::processMessage( GstMessage *message )
}
}
+
static gboolean wrap_element_query_position (GstElement *element, GstFormat format, gint64 *cur)
{
#ifdef AVMEDIA_GST_0_10
@@ -411,6 +422,7 @@ static gboolean wrap_element_query_position (GstElement *element, GstFormat form
#endif
}
+
static gboolean wrap_element_query_duration (GstElement *element, GstFormat format, gint64 *duration)
{
#ifdef AVMEDIA_GST_0_10
@@ -421,6 +433,7 @@ static gboolean wrap_element_query_duration (GstElement *element, GstFormat form
#endif
}
+
GstBusSyncReply Player::processSyncMessage( GstMessage *message )
{
#if OSL_DEBUG_LEVEL > 0
@@ -543,7 +556,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
g_object_unref( pad );
}
}
-#endif
+#endif // AVMEDIA_GST_0_10
} else if (gst_is_missing_plugin_message(message)) {
TheMissingPluginInstaller::get().report(this, message);
if( mnWidth == 0 ) {
@@ -560,6 +573,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
return GST_BUS_PASS;
}
+
void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
{
GstBus *pBus;
@@ -599,6 +613,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
g_object_unref( pBus );
}
+
bool Player::create( const OUString& rURL )
{
bool bRet = false;
@@ -627,7 +642,6 @@ bool Player::create( const OUString& rURL )
}
-
void SAL_CALL Player::start()
throw (uno::RuntimeException, std::exception)
{
@@ -642,7 +656,6 @@ void SAL_CALL Player::start()
}
-
void SAL_CALL Player::stop()
throw (uno::RuntimeException, std::exception)
{
@@ -657,7 +670,6 @@ void SAL_CALL Player::stop()
}
-
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException, std::exception)
{
@@ -677,7 +689,6 @@ sal_Bool SAL_CALL Player::isPlaying()
}
-
double SAL_CALL Player::getDuration()
throw (uno::RuntimeException, std::exception)
{
@@ -694,7 +705,6 @@ double SAL_CALL Player::getDuration()
}
-
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException, std::exception)
{
@@ -716,7 +726,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
-
double SAL_CALL Player::getMediaTime()
throw (uno::RuntimeException, std::exception)
{
@@ -734,6 +743,7 @@ double SAL_CALL Player::getMediaTime()
return position;
}
+
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
@@ -743,7 +753,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isPlaybackLoop()
throw (uno::RuntimeException, std::exception)
{
@@ -753,7 +762,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
}
-
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
@@ -777,7 +785,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isMute()
throw (uno::RuntimeException, std::exception)
{
@@ -787,7 +794,6 @@ sal_Bool SAL_CALL Player::isMute()
}
-
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException, std::exception)
{
@@ -805,7 +811,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
}
-
sal_Int16 SAL_CALL Player::getVolumeDB()
throw (uno::RuntimeException, std::exception)
{
@@ -825,7 +830,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
}
-
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
throw (uno::RuntimeException, std::exception)
{
@@ -854,7 +858,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
}
-
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
throw (uno::RuntimeException, std::exception)
{
@@ -896,7 +899,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
}
-
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
throw (uno::RuntimeException, std::exception)
{
@@ -912,7 +914,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
}
-
OUString SAL_CALL Player::getImplementationName()
throw (uno::RuntimeException, std::exception)
{
@@ -920,7 +921,6 @@ OUString SAL_CALL Player::getImplementationName()
}
-
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException, std::exception)
{
@@ -928,7 +928,6 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
}
-
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
throw (uno::RuntimeException, std::exception)
{
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 3f95a88b9599..b6c51fa4768f 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -32,9 +32,6 @@ typedef struct _GstVideoOverlay GstVideoOverlay;
namespace avmedia { namespace gstreamer {
-// - Player -
-
-
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > GstPlayer_BASE;
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 2c9af23d46e2..9246a4497165 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -28,10 +28,6 @@
namespace avmedia { namespace gstreamer {
-
-// - Window -
-
-
class Player;
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index cb67176c3fc0..f8ce9d65a1e3 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -27,10 +27,6 @@
namespace avmedia { namespace macavf {
-// ----------------
-// - FrameGrabber -
-// ----------------
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index bf54b01e042b..2cbe8cb5593b 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -29,15 +29,10 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ----------------
-// - FrameGrabber -
-// ----------------
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& /*rxMgr*/ )
: mpImageGen( nullptr )
{}
-// ------------------------------------------------------------------------------
FrameGrabber::~FrameGrabber()
{
@@ -45,7 +40,6 @@ FrameGrabber::~FrameGrabber()
CFRelease( mpImageGen );
}
-// ------------------------------------------------------------------------------
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
@@ -64,7 +58,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
return create( pMovie );
}
-// ------------------------------------------------------------------------------
bool FrameGrabber::create( AVAsset* pMovie )
{
@@ -79,7 +72,6 @@ bool FrameGrabber::create( AVAsset* pMovie )
return true;
}
-// ------------------------------------------------------------------------------
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
@@ -112,7 +104,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
@@ -120,7 +111,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -128,7 +118,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 87db73174a33..6e93d7e5c19c 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -25,9 +25,6 @@
#include "com/sun/star/media/XManager.hdl"
-// -----------
-// - Manager -
-// -----------
namespace avmedia { namespace macavf {
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 0bc5abda1119..3e413a36232e 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -26,22 +26,16 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ----------------
-// - Manager -
-// ----------------
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
OSL_TRACE( "Constructing avmedia::macavf::Manager" );
}
-// ------------------------------------------------------------------------------
Manager::~Manager()
{}
-// ------------------------------------------------------------------------------
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
throw (uno::RuntimeException)
@@ -58,7 +52,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
@@ -66,7 +59,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -74,7 +66,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_MANAGER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 9f26b47b1455..e1c644bab010 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -28,12 +28,6 @@
namespace avmedia { namespace macavf {
-/*
-// ----------
-// - Player -
-// ----------
-*/
-
class Player
: public MacAVObserverHandler
, public ::cppu::WeakImplHelper< css::media::XPlayer,
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index cb366c0bb12c..4f753c3f0441 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -73,10 +73,6 @@ MacAVObserverObject* MacAVObserverHandler::getObserver()
}
-// ----------------
-// - Player -
-// ----------------
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
: mxMgr( rxMgr )
, mpPlayer( nullptr )
@@ -86,7 +82,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
, mbLooping( false )
{}
-// ------------------------------------------------------------------------------
Player::~Player()
{
@@ -103,7 +98,6 @@ Player::~Player()
CFRelease( mpPlayer );
}
-// ------------------------------------------------------------------------------
bool Player::handleObservation( NSString* pKeyPath )
{
@@ -117,7 +111,6 @@ bool Player::handleObservation( NSString* pKeyPath )
return true;
}
-// ------------------------------------------------------------------------------
bool Player::create( const ::rtl::OUString& rURL )
{
@@ -163,7 +156,6 @@ bool Player::create( const ::rtl::OUString& rURL )
return true;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::start()
throw (uno::RuntimeException)
@@ -181,7 +173,6 @@ void SAL_CALL Player::start()
// else // TODO: delay until it becomes ready
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::stop()
throw (uno::RuntimeException)
@@ -194,7 +185,6 @@ void SAL_CALL Player::stop()
[mpPlayer pause];
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
@@ -205,7 +195,6 @@ sal_Bool SAL_CALL Player::isPlaying()
return (fRate != 0.0);
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getDuration()
throw (uno::RuntimeException)
@@ -225,7 +214,6 @@ double SAL_CALL Player::getDuration()
return duration;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
@@ -235,7 +223,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
[mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getMediaTime()
throw (uno::RuntimeException)
@@ -252,7 +239,6 @@ double SAL_CALL Player::getMediaTime()
return position;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setStopTime( double fTime )
throw (uno::RuntimeException)
@@ -261,7 +247,6 @@ void SAL_CALL Player::setStopTime( double fTime )
mfStopTime = fTime;
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getStopTime()
throw (uno::RuntimeException)
@@ -269,7 +254,6 @@ double SAL_CALL Player::getStopTime()
return mfStopTime;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
@@ -278,7 +262,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
mbLooping = bSet;
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isPlaybackLoop()
throw (uno::RuntimeException)
@@ -288,7 +271,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
return bRet;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
@@ -302,7 +284,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
[mpPlayer setMuted:mbMuted];
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isMute()
throw (uno::RuntimeException)
@@ -311,7 +292,6 @@ sal_Bool SAL_CALL Player::isMute()
return mbMuted;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
@@ -326,7 +306,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
[mpPlayer setVolume:mfUnmutedVolume];
}
-// ------------------------------------------------------------------------------
sal_Int16 SAL_CALL Player::getVolumeDB()
throw (uno::RuntimeException)
@@ -345,7 +324,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
return (sal_Int16)nVolumeDB;
}
-// ------------------------------------------------------------------------------
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
throw (uno::RuntimeException)
@@ -364,7 +342,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
return aSize;
}
-// ------------------------------------------------------------------------------
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
@@ -389,7 +366,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
return xRet;
}
-// ------------------------------------------------------------------------------
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
throw (uno::RuntimeException)
@@ -405,7 +381,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
@@ -413,7 +388,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -421,7 +395,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_PLAYER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 63f77ab0f872..396f75a9b24b 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -26,9 +26,6 @@
#include "com/sun/star/media/XPlayerWindow.hdl"
-// ---------------
-// - MyMediaView -
-// ---------------
@interface MyMediaView : NSView
@property (nonatomic, readonly, strong) AVPlayer* player;
@@ -39,10 +36,6 @@
namespace avmedia { namespace macavf {
-// ---------------
-// - Window -
-// ---------------
-
class Player;
class Window
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index a5465017c896..0ddee7fe120d 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -28,10 +28,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ---------------
-// - Window -
-// ---------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView )
: mxMgr( i_rxMgr )
, maListeners( maMutex )
@@ -71,7 +67,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
[mpView.layer addSublayer:mpPlayerLayer];
}
-// ------------------------------------------------------------------------------
Window::~Window()
{
@@ -79,7 +74,6 @@ Window::~Window()
[mpPlayerLayer release];
}
-// ------------------------------------------------------------------------------
bool Window::handleObservation( NSString* pKeyPath )
{
@@ -90,13 +84,11 @@ bool Window::handleObservation( NSString* pKeyPath )
}
// XPlayerWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::update()
throw (uno::RuntimeException)
{}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
throw (uno::RuntimeException)
@@ -104,7 +96,6 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
return false;
}
-// ------------------------------------------------------------------------------
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
@@ -112,7 +103,6 @@ media::ZoomLevel SAL_CALL Window::getZoomLevel( )
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
@@ -121,7 +111,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
}
// XWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
throw (uno::RuntimeException)
@@ -140,7 +129,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
[mpPlayerLayer setFrame:CGRectMake(viewFrame.origin.x, viewFrame.origin.y, viewFrame.size.width, viewFrame.size.height)];
}
-// ------------------------------------------------------------------------------
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
@@ -155,7 +143,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setVisible( sal_Bool bVisible )
throw (uno::RuntimeException)
@@ -163,7 +150,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
OSL_TRACE ("Window::setVisible(%d)", bVisible);
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setEnable( sal_Bool bEnable )
throw (uno::RuntimeException)
@@ -171,7 +157,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable )
OSL_TRACE ("Window::setEnable(%d)", bEnable);
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setFocus()
throw (uno::RuntimeException)
@@ -179,7 +164,6 @@ void SAL_CALL Window::setFocus()
OSL_TRACE ("Window::setFocus");
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
@@ -187,7 +171,6 @@ void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListe
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
@@ -195,7 +178,6 @@ void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowLi
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
@@ -203,7 +185,6 @@ void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
@@ -211,7 +192,6 @@ void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusList
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
@@ -219,7 +199,6 @@ void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >&
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
@@ -227,7 +206,6 @@ void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
@@ -235,7 +213,6 @@ void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
@@ -243,7 +220,6 @@ void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseList
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
@@ -251,7 +227,6 @@ void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseM
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
@@ -259,7 +234,6 @@ void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMou
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
@@ -267,7 +241,6 @@ void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
@@ -277,14 +250,12 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
// XComponent
-// ------------------------------------------------------------------------------
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
@@ -292,7 +263,6 @@ void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListen
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
@@ -301,7 +271,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
}
// XServiceInfo
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
@@ -309,7 +278,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -317,7 +285,6 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_WINDOW_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0a697c1aed43..7d2a8df902c7 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -27,10 +27,6 @@
namespace avmedia { namespace quicktime {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index e3cc4809bccb..2fd457bbf092 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -35,9 +35,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -49,7 +46,6 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >&
}
-
FrameGrabber::~FrameGrabber()
{
if( mbInitialized )
@@ -63,7 +59,6 @@ FrameGrabber::~FrameGrabber()
}
-
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -87,7 +82,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
}
-
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -108,7 +102,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -116,7 +109,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -124,7 +116,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 0ab910c0be94..215e14c47017 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -26,9 +26,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace quicktime {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index b7081844f783..1426020a5be7 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -26,9 +26,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -36,13 +33,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Manager::~Manager()
{
}
-
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
throw (uno::RuntimeException)
{
@@ -59,7 +54,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -67,7 +61,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -75,7 +68,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 11e12faf4349..636efb034fee 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -26,12 +26,6 @@
namespace avmedia { namespace quicktime {
-/*
-
-// - Player -
-
-*/
-
class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index b5cd5f1e4df1..0c32df1e1444 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -29,16 +29,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr ),
mpMovie( nil ),
- /* GST
- mbFakeVideo (false ),
- */
mnUnmutedVolume( 0 ),
mnStopTime( DBL_MAX ), //max double
mbMuted( false ),
@@ -51,7 +44,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Player::~Player()
{
if( mpMovie )
@@ -69,7 +61,6 @@ QTMovie* Player::getMovie()
}
-
bool Player::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -109,7 +100,6 @@ bool Player::create( const ::rtl::OUString& rURL )
}
-
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -122,7 +112,6 @@ void SAL_CALL Player::start( )
}
-
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -134,7 +123,6 @@ void SAL_CALL Player::stop( )
}
-
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -152,7 +140,6 @@ sal_Bool SAL_CALL Player::isPlaying()
}
-
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -169,7 +156,6 @@ double SAL_CALL Player::getDuration( )
}
-
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -182,7 +168,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
-
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -219,7 +204,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -232,7 +216,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
}
-
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -251,7 +234,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -261,7 +243,6 @@ sal_Bool SAL_CALL Player::isMute( )
}
-
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -288,7 +269,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
}
-
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -313,7 +293,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
}
-
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -323,7 +302,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
}
-
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -348,7 +326,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
}
-
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (css::uno::RuntimeException)
{
@@ -371,7 +348,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -379,7 +355,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -387,7 +362,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 4268b358c55b..cbcb9ee2faf9 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -28,10 +28,6 @@
namespace avmedia { namespace quicktime {
-
-// - Window -
-
-
class Player;
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 415af5527b5d..61634bc04b29 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -27,22 +27,17 @@ using namespace ::com::sun::star;
namespace avmedia { namespace priv {
-// - MediaEventListenersImpl -
-
-
MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
mpNotifyWindow( &rEventWindow )
{
}
-
MediaEventListenersImpl::~MediaEventListenersImpl()
{
}
-
void MediaEventListenersImpl::cleanUp()
{
Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ) );
@@ -50,14 +45,12 @@ void MediaEventListenersImpl::cleanUp()
}
-
-void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& /* Source */ )
+void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& )
throw (css::uno::RuntimeException, std::exception)
{
}
-
void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -77,7 +70,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
}
-
void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -96,7 +88,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
}
-
void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -116,7 +107,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
}
}
-// ----------------------------------------------gvd-----------------------
void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
@@ -138,8 +128,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
}
-
-void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& )
throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -151,8 +140,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent&
}
-
-void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& )
throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -164,7 +152,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent&
}
-
void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -179,7 +166,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
}
-
void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -194,20 +180,19 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
}
-
-void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& )
throw (css::uno::RuntimeException, std::exception)
{
}
-
-void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
throw (css::uno::RuntimeException, std::exception)
{
}
+
} // namespace priv
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f7c6fe885209..5fd94ee1a6ba 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -39,10 +39,6 @@ using namespace ::com::sun::star;
namespace avmedia {
-
-// - MediaWindow -
-
-
MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
mpImpl( VclPtr<priv::MediaWindowImpl>::Create( parent, this, bInternalMediaControl ) )
{
@@ -50,154 +46,130 @@ MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
}
-
MediaWindow::~MediaWindow()
{
mpImpl.disposeAndClear();
}
-
void MediaWindow::setURL( const OUString& rURL, const OUString& rReferer )
{
mpImpl->setURL( rURL, OUString(), rReferer );
}
-
const OUString& MediaWindow::getURL() const
{
return mpImpl->getURL();
}
-
bool MediaWindow::isValid() const
{
return mpImpl->isValid();
}
-
-void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseMove( const MouseEvent& )
{
}
-
-void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonDown( const MouseEvent& )
{
}
-
-void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonUp( const MouseEvent& )
{
}
-
-void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyInput( const KeyEvent& )
{
}
-
-void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyUp( const KeyEvent& )
{
}
-
-
-void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
+void MediaWindow::Command( const CommandEvent& )
{
}
-
-sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& )
{
return 0;
}
-
-sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& )
{
return 0;
}
-
-void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
+void MediaWindow::StartDrag( sal_Int8, const Point& )
{
}
-
Size MediaWindow::getPreferredSize() const
{
return mpImpl->getPreferredSize();
}
-
void MediaWindow::setPosSize( const Rectangle& rNewRect )
{
mpImpl->setPosSize( rNewRect );
}
-
void MediaWindow::setPointer( const Pointer& rPointer )
{
mpImpl->setPointer( rPointer );
}
-
bool MediaWindow::start()
{
return mpImpl->start();
}
-
void MediaWindow::updateMediaItem( MediaItem& rItem ) const
{
mpImpl->updateMediaItem( rItem );
}
-
void MediaWindow::executeMediaItem( const MediaItem& rItem )
{
mpImpl->executeMediaItem( rItem );
}
-
void MediaWindow::show()
{
mpImpl->Show();
}
-
void MediaWindow::hide()
{
mpImpl->Hide();
}
-
vcl::Window* MediaWindow::getWindow() const
{
return mpImpl.get();
}
-
void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
static const char* pFilters[] = { "Advanced Audio Coding", "aac",
@@ -236,8 +208,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
}
-
-bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
+bool MediaWindow::executeMediaURLDialog(vcl::Window*,
OUString& rURL, bool *const o_pbLink)
{
::sfx2::FileDialogHelper aDlg( (o_pbLink)
@@ -325,7 +296,6 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
}
-
void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
{
ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
@@ -335,7 +305,6 @@ void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
}
-
bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel )
{
const INetURLObject aURL( rURL );
@@ -391,14 +360,12 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
}
-
uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType )
{
return priv::MediaWindowImpl::createPlayer( rURL, rReferer, pMimeType );
}
-
uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
const OUString& rReferer,
const OUString& sMimeType,
@@ -447,17 +414,18 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
return xRet;
}
+
BitmapEx MediaWindow::getAudioLogo()
{
return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO));
}
+
BitmapEx MediaWindow::getEmptyLogo()
{
return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO));
}
-
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4d6305c8ca12..65300406b276 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -49,20 +49,19 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
::CoInitialize( NULL );
}
+
FrameGrabber::~FrameGrabber()
{
::CoUninitialize();
}
+
IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
{
IMediaDet* pDet = NULL;
@@ -85,6 +84,7 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
return pDet;
}
+
bool FrameGrabber::create( const OUString& rURL )
{
// just check if a MediaDet interface can be created with the given URL
@@ -102,6 +102,7 @@ bool FrameGrabber::create( const OUString& rURL )
return !maURL.isEmpty();
}
+
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -198,18 +199,21 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
+
OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 98dc0cc78d1c..d9845c08cb18 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -28,10 +28,6 @@ struct IMediaDet;
namespace avmedia { namespace win {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index d33c9c8949bd..a5042d4e49b9 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -30,18 +30,17 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
}
+
Manager::~Manager()
{
}
+
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
throw (uno::RuntimeException)
{
@@ -55,18 +54,21 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
return xRet;
}
+
OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f309c750c10..a70861ef22d8 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -25,9 +25,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace win {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 8bf50f231d45..5bb45e07a1ad 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -85,9 +85,6 @@ bool isWindowsVistaOrHigher()
}
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
Player_BASE(m_aMutex),
mxMgr( rxMgr ),
@@ -110,6 +107,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
::CoInitialize( NULL );
}
+
Player::~Player()
{
if( mnFrameWnd )
@@ -118,6 +116,7 @@ Player::~Player()
::CoUninitialize();
}
+
void SAL_CALL Player::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -156,6 +155,7 @@ void SAL_CALL Player::disposing()
mpGB->Release();
}
+
bool Player::create( const OUString& rURL )
{
HRESULT hR;
@@ -202,11 +202,13 @@ bool Player::create( const OUString& rURL )
return bRet;
}
+
const IVideoWindow* Player::getVideoWindow() const
{
return mpVW;
}
+
void Player::setNotifyWnd( HWND nNotifyWnd )
{
mbAddWindow = false;
@@ -214,6 +216,7 @@ void Player::setNotifyWnd( HWND nNotifyWnd )
mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
}
+
long Player::processEvent()
{
long nCode;
@@ -241,6 +244,7 @@ long Player::processEvent()
return 0;
}
+
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -284,6 +288,7 @@ void SAL_CALL Player::start( )
}
}
+
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -292,6 +297,7 @@ void SAL_CALL Player::stop( )
mpMC->Stop();
}
+
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -306,6 +312,7 @@ sal_Bool SAL_CALL Player::isPlaying()
return bRet;
}
+
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -319,6 +326,7 @@ double SAL_CALL Player::getDuration( )
return aRefTime;
}
+
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -335,6 +343,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
}
+
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -348,6 +357,7 @@ double SAL_CALL Player::getMediaTime( )
return aRefTime;
}
+
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -356,6 +366,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
mbLooping = bSet;
}
+
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -364,6 +375,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
return mbLooping;
}
+
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -376,6 +388,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
}
+
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -384,6 +397,7 @@ sal_Bool SAL_CALL Player::isMute( )
return mbMuted;
}
+
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -395,6 +409,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
mpBA->put_Volume( mnUnmutedVolume );
}
+
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -403,6 +418,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
}
+
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -422,6 +438,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
return aSize;
}
+
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -443,6 +460,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
return xRet;
}
+
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (uno::RuntimeException)
{
@@ -461,18 +479,21 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
return xRet;
}
+
OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index e7c84012c09b..2923d0ded939 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -46,13 +46,10 @@ struct IDirectDrawSurface;
namespace avmedia { namespace win {
-
-// - Player -
-
-
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > Player_BASE;
+
class Player : public cppu::BaseMutex,
public Player_BASE
{
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index fa01b19c1ed7..ca44d392ca91 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -34,12 +34,9 @@ struct IVideoWindow;
namespace avmedia { namespace win {
-
-// - Window -
-
-
class Player;
+
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
css::lang::XServiceInfo >
{
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h b/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
index ec8ea8e2bbbf..fd8ef3715082 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
@@ -6,17 +6,15 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2, or (at your option)
// any later version.
-//
// GCC is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
// You should have received a copy of the GNU General Public License
// along with GCC; see the file COPYING. If not, write to
// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
// Boston, MA 02110-1301, USA.
-
+//
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
@@ -25,10 +23,10 @@
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-
+//
// Written by Nathan Sidwell, Codesourcery LLC, <nathan@codesourcery.com>
#ifndef __RTTI_H
-#define __RTTI_H
+#define __RTTI_H
#include <typeinfo>
@@ -38,10 +36,10 @@ namespace __cxxabiv1
class __fundamental_type_info : public std::type_info
{
public:
- explicit
+ explicit
__fundamental_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__fundamental_type_info();
};
@@ -49,10 +47,10 @@ namespace __cxxabiv1
class __array_type_info : public std::type_info
{
public:
- explicit
+ explicit
__array_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__array_type_info();
};
@@ -60,15 +58,15 @@ namespace __cxxabiv1
class __function_type_info : public std::type_info
{
public:
- explicit
+ explicit
__function_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__function_type_info();
protected:
// Implementation defined member function.
- virtual bool
+ virtual bool
__is_function_p() const;
};
@@ -76,10 +74,10 @@ namespace __cxxabiv1
class __enum_type_info : public std::type_info
{
public:
- explicit
+ explicit
__enum_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__enum_type_info();
};
@@ -87,26 +85,26 @@ namespace __cxxabiv1
class __pbase_type_info : public std::type_info
{
public:
- unsigned int __flags; // Qualification of the target object.
- const std::type_info* __pointee; // Type of pointed to object.
+ unsigned int __flags; // Qualification of the target object.
+ const std::type_info* __pointee; // Type of pointed to object.
- explicit
- __pbase_type_info(const char* __n, int __quals,
- const std::type_info* __type)
+ explicit
+ __pbase_type_info(const char* __n, int __quals,
+ const std::type_info* __type)
: std::type_info(__n), __flags(__quals), __pointee(__type)
{ }
-
- virtual
+
+ virtual
~__pbase_type_info();
// Implementation defined type.
- enum __masks
+ enum __masks
{
- __const_mask = 0x1,
- __volatile_mask = 0x2,
- __restrict_mask = 0x4,
- __incomplete_mask = 0x8,
- __incomplete_class_mask = 0x10
+ __const_mask = 0x1,
+ __volatile_mask = 0x2,
+ __restrict_mask = 0x4,
+ __incomplete_mask = 0x8,
+ __incomplete_class_mask = 0x10
};
protected:
@@ -116,36 +114,36 @@ namespace __cxxabiv1
operator=(const __pbase_type_info&);
// Implementation defined member functions.
- virtual bool
- __do_catch(const std::type_info* __thr_type, void** __thr_obj,
- unsigned int __outer) const;
+ virtual bool
+ __do_catch(const std::type_info* __thr_type, void** __thr_obj,
+ unsigned int __outer) const;
- inline virtual bool
+ inline virtual bool
__pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ unsigned __outer) const;
};
// Type information for simple pointers.
class __pointer_type_info : public __pbase_type_info
{
public:
- explicit
- __pointer_type_info(const char* __n, int __quals,
- const std::type_info* __type)
+ explicit
+ __pointer_type_info(const char* __n, int __quals,
+ const std::type_info* __type)
: __pbase_type_info (__n, __quals, __type) { }
- virtual
+ virtual
~__pointer_type_info();
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__is_pointer_p() const;
- virtual bool
- __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ virtual bool
+ __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
+ unsigned __outer) const;
};
class __class_type_info;
@@ -156,13 +154,13 @@ namespace __cxxabiv1
public:
__class_type_info* __context; // Class of the member.
- explicit
+ explicit
__pointer_to_member_type_info(const char* __n, int __quals,
- const std::type_info* __type,
- __class_type_info* __klass)
+ const std::type_info* __type,
+ __class_type_info* __klass)
: __pbase_type_info(__n, __quals, __type), __context(__klass) { }
- virtual
+ virtual
~__pointer_to_member_type_info();
protected:
@@ -172,38 +170,38 @@ namespace __cxxabiv1
operator=(const __pointer_to_member_type_info&);
// Implementation defined member function.
- virtual bool
+ virtual bool
__pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ unsigned __outer) const;
};
// Helper class for __vmi_class_type.
class __base_class_type_info
{
public:
- const __class_type_info* __base_type; // Base class type.
- long __offset_flags; // Offset and info.
+ const __class_type_info* __base_type; // Base class type.
+ long __offset_flags; // Offset and info.
- enum __offset_flags_masks
+ enum __offset_flags_masks
{
- __virtual_mask = 0x1,
- __public_mask = 0x2,
- __hwm_bit = 2,
- __offset_shift = 8 // Bits to shift offset.
+ __virtual_mask = 0x1,
+ __public_mask = 0x2,
+ __hwm_bit = 2,
+ __offset_shift = 8 // Bits to shift offset.
};
-
+
// Implementation defined member functions.
- bool
+ bool
__is_virtual_p() const
{ return __offset_flags & __virtual_mask; }
- bool
+ bool
__is_public_p() const
{ return __offset_flags & __public_mask; }
- ptrdiff_t
+ ptrdiff_t
__offset() const
- {
+ {
// This shift, being of a signed type, is implementation
// defined. GCC implements such shifts as arithmetic, which is
// what we want.
@@ -215,10 +213,10 @@ namespace __cxxabiv1
class __class_type_info : public std::type_info
{
public:
- explicit
+ explicit
__class_type_info (const char *__n) : type_info(__n) { }
- virtual
+ virtual
~__class_type_info ();
// Implementation defined types.
@@ -228,27 +226,27 @@ namespace __cxxabiv1
// not publicly contained.
enum __sub_kind
{
- // We have no idea.
- __unknown = 0,
-
- // Not contained within us (in some circumstances this might
- // mean not contained publicly)
- __not_contained,
-
- // Contained ambiguously.
- __contained_ambig,
-
- // Via a virtual path.
- __contained_virtual_mask = __base_class_type_info::__virtual_mask,
-
- // Via a public path.
- __contained_public_mask = __base_class_type_info::__public_mask,
-
- // Contained within us.
- __contained_mask = 1 << __base_class_type_info::__hwm_bit,
-
- __contained_private = __contained_mask,
- __contained_public = __contained_mask | __contained_public_mask
+ // We have no idea.
+ __unknown = 0,
+
+ // Not contained within us (in some circumstances this might
+ // mean not contained publicly)
+ __not_contained,
+
+ // Contained ambiguously.
+ __contained_ambig,
+
+ // Via a virtual path.
+ __contained_virtual_mask = __base_class_type_info::__virtual_mask,
+
+ // Via a public path.
+ __contained_public_mask = __base_class_type_info::__public_mask,
+
+ // Contained within us.
+ __contained_mask = 1 << __base_class_type_info::__hwm_bit,
+
+ __contained_private = __contained_mask,
+ __contained_public = __contained_mask | __contained_public_mask
};
struct __upcast_result;
@@ -256,19 +254,19 @@ namespace __cxxabiv1
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_upcast(const __class_type_info* __dst_type, void**__obj_ptr) const;
- virtual bool
- __do_catch(const type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ virtual bool
+ __do_catch(const type_info* __thr_type, void** __thr_obj,
+ unsigned __outer) const;
public:
- // Helper for upcast. See if DST is us, or one of our bases.
- // Return false if not found, true if found.
- virtual bool
+ // Helper for upcast. See if DST is us, or one of our bases.
+ // Return false if not found, true if found.
+ virtual bool
__do_upcast(const __class_type_info* __dst, const void* __obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
// Indicate whether SRC_PTR of type SRC_TYPE is contained publicly
// within OBJ_PTR. OBJ_PTR points to a base object of our type,
@@ -276,10 +274,10 @@ namespace __cxxabiv1
// objects might be contained within this type. If SRC_PTR is one
// of our SRC_TYPE bases, indicate the virtuality. Returns
// not_contained for non containment or private containment.
- inline __sub_kind
+ inline __sub_kind
__find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
// Helper for dynamic cast. ACCESS_PATH gives the access from the
// most derived object to this base. DST_TYPE indicates the
@@ -288,20 +286,20 @@ namespace __cxxabiv1
// started from and SRC_PTR points to that base within the most
// derived object. Fill in RESULT with what we find. Return true
// if we have located an ambiguous match.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
-
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
+
// Helper for find_public_subobj. SRC2DST indicates how SRC_TYPE
// bases are inherited by the type started from -- which is not
// necessarily the current type. The current type will be a base
// of the destination type. OBJ_PTR points to the current base.
- virtual __sub_kind
+ virtual __sub_kind
__do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
};
// Type information for a class with a single non-virtual base.
@@ -310,11 +308,11 @@ namespace __cxxabiv1
public:
const __class_type_info* __base_type;
- explicit
+ explicit
__si_class_type_info(const char *__n, const __class_type_info *__base)
: __class_type_info(__n), __base_type(__base) { }
- virtual
+ virtual
~__si_class_type_info();
protected:
@@ -324,65 +322,65 @@ namespace __cxxabiv1
operator=(const __si_class_type_info&);
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
- virtual __sub_kind
+ virtual __sub_kind
__do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __sub_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __sub_ptr) const;
- virtual bool
+ virtual bool
__do_upcast(const __class_type_info*__dst, const void*__obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
};
// Type information for a class with multiple and/or virtual bases.
- class __vmi_class_type_info : public __class_type_info
+ class __vmi_class_type_info : public __class_type_info
{
public:
- unsigned int __flags; // Details about the class hierarchy.
- unsigned int __base_count; // Number of direct bases.
+ unsigned int __flags; // Details about the class hierarchy.
+ unsigned int __base_count; // Number of direct bases.
// The array of bases uses the trailing array struct hack so this
// class is not constructable with a normal constructor. It is
// internally generated by the compiler.
- __base_class_type_info __base_info[1]; // Array of bases.
+ __base_class_type_info __base_info[1]; // Array of bases.
- explicit
+ explicit
__vmi_class_type_info(const char* __n, int ___flags)
: __class_type_info(__n), __flags(___flags), __base_count(0) { }
- virtual
+ virtual
~__vmi_class_type_info();
// Implementation defined types.
- enum __flags_masks
+ enum __flags_masks
{
- __non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
- __diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
- __flags_unknown_mask = 0x10
+ __non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
+ __diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
+ __flags_unknown_mask = 0x10
};
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
-
- virtual __sub_kind
- __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
-
- virtual bool
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
+
+ virtual __sub_kind
+ __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
+
+ virtual bool
__do_upcast(const __class_type_info* __dst, const void* __obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
};
// Dynamic cast runtime.
@@ -394,9 +392,9 @@ namespace __cxxabiv1
// -3: src_type is a multiple public non-virtual base of dst_type
extern "C" void*
__dynamic_cast(const void* __src_ptr, // Starting object.
- const __class_type_info* __src_type, // Static type of object.
- const __class_type_info* __dst_type, // Desired target type.
- ptrdiff_t __src2dst); // How src and dst are related.
+ const __class_type_info* __src_type, // Static type of object.
+ const __class_type_info* __dst_type, // Desired target type.
+ ptrdiff_t __src2dst); // How src and dst are related.
// Returns the type_info for the currently handled exception [15.3/8], or
@@ -405,8 +403,8 @@ namespace __cxxabiv1
__cxa_current_exception_type();
} // namespace __cxxabiv1
-// User programs should use the alias `abi'.
+// User programs should use the alias `abi'.
namespace abi = __cxxabiv1;
-#endif // __RTTI_H
+#endif // __RTTI_H
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 071fbd7b84fc..22a1453faa78 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1156,7 +1156,7 @@ OUString querySingleValue(
// copied from connectivity/source/dbtools, can't use the function directly
-bool implSetObject( const Reference< XParameters >& _rxParameters,
+bool implSetObject( const Reference< XParameters >& _rxParameters,
const sal_Int32 _nColumnIndex, const Any& _rValue)
{
bool bSuccessfullyReRouted = true;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 8fa7656dc30f..f68612a171cd 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -139,7 +139,7 @@ void extractNameValuePairsFromInsert( String2StringMap & map, const OString & la
sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype );
// copied from connectivity/source/dbtools, can't use the function directly
-bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters,
+bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters,
const sal_Int32 _nColumnIndex, const com::sun::star::uno::Any& _rValue);
class DisposeGuard
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index be7401059177..94fa789350f2 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -787,18 +787,15 @@ IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const s
OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set");
return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::KEY_NONE;
}
-// -------------------------------------------------------------------------
sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; }
sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; }
sal_Int32 OSQLScanner::GetSQLRule() { return SQL; }
sal_Int32 OSQLScanner::GetDATERule() { return DATE; }
sal_Int32 OSQLScanner::GetSTRINGRule() { return STRING; }
-// -------------------------------------------------------------------------
void OSQLScanner::setScanner(bool _bNull)
{
xxx_pGLOBAL_SQLSCAN = _bNull ? NULL : this;
}
-// -------------------------------------------------------------------------
sal_Int32 OSQLScanner::SQLlex()
{
return SQLyylex();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d1c50a11566a..dfb8297db435 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -51,11 +51,6 @@
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
-
-
-// - Namespaces -
-
-
using namespace ::ucbhelper;
using namespace ::cppu;
using namespace ::com::sun::star::lang;
@@ -65,9 +60,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-// - SearchThread -
-
-
SearchThread::SearchThread( SearchProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
const INetURLObject& rStartURL ) :
@@ -79,13 +71,11 @@ SearchThread::SearchThread( SearchProgress* pProgess,
}
-
SearchThread::~SearchThread()
{
}
-
void SearchThread::execute()
{
const OUString aFileType( mpBrowser->m_pCbbFileType->GetText() );
@@ -114,7 +104,6 @@ void SearchThread::execute()
}
-
void SearchThread::ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< OUString >& rFormats,
bool bRecursive )
@@ -200,9 +189,6 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
}
-// - SearchProgress -
-
-
SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL )
: ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
, parent_(pParent)
@@ -215,11 +201,13 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar
m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
}
+
SearchProgress::~SearchProgress()
{
disposeOnce();
}
+
void SearchProgress::dispose()
{
m_pFtSearchDir.clear();
@@ -237,14 +225,12 @@ void SearchProgress::Terminate()
}
-
IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void)
{
Terminate();
}
-
IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
{
if (maSearchThread.is())
@@ -256,7 +242,6 @@ IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
}
-
short SearchProgress::Execute()
{
OSL_FAIL( "SearchProgress cannot be executed via Dialog::Execute!\n"
@@ -266,7 +251,6 @@ short SearchProgress::Execute()
}
-
void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
{
assert(!maSearchThread.is());
@@ -277,9 +261,6 @@ void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl
}
-// - TakeThread -
-
-
TakeThread::TakeThread(
TakeProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
@@ -293,13 +274,11 @@ TakeThread::TakeThread(
}
-
TakeThread::~TakeThread()
{
}
-
void TakeThread::execute()
{
sal_Int32 nEntries;
@@ -340,7 +319,7 @@ void TakeThread::execute()
Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), nullptr, true );
}
-// - TakeProgress -
+
TakeProgress::TakeProgress(vcl::Window* pWindow)
: ModalDialog(pWindow, "GalleryApplyProgress",
"cui/ui/galleryapplyprogress.ui")
@@ -352,11 +331,13 @@ TakeProgress::TakeProgress(vcl::Window* pWindow)
m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) );
}
+
TakeProgress::~TakeProgress()
{
disposeOnce();
}
+
void TakeProgress::dispose()
{
m_pFtTakeFile.clear();
@@ -365,17 +346,20 @@ void TakeProgress::dispose()
ModalDialog::dispose();
}
+
void TakeProgress::Terminate()
{
if (maTakeThread.is())
maTakeThread->terminate();
}
+
IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void)
{
Terminate();
}
+
IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
{
if (maTakeThread.is())
@@ -428,7 +412,6 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
}
-
short TakeProgress::Execute()
{
OSL_FAIL( "TakeProgress cannot be executed via Dialog::Execute!\n"
@@ -438,7 +421,6 @@ short TakeProgress::Execute()
}
-
void TakeProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
{
assert(!maTakeThread.is());
@@ -449,7 +431,6 @@ void TakeProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
}
-// - ActualizeProgress -
ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
: ModalDialog(pWindow, "GalleryUpdateProgress",
"cui/ui/galleryupdateprogress.ui")
@@ -461,11 +442,13 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
m_pBtnCancel->SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
}
+
ActualizeProgress::~ActualizeProgress()
{
disposeOnce();
}
+
void ActualizeProgress::dispose()
{
m_pFtActualizeFile.clear();
@@ -473,6 +456,7 @@ void ActualizeProgress::dispose()
ModalDialog::dispose();
}
+
short ActualizeProgress::Execute()
{
short nRet;
@@ -488,7 +472,6 @@ short ActualizeProgress::Execute()
}
-
IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void)
{
pTheme->AbortActualize();
@@ -496,7 +479,6 @@ IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void)
}
-
IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
{
if ( _pTimer )
@@ -510,7 +492,6 @@ IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
}
-
IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void )
{
for( long i = 0; i < 128; i++ )
@@ -522,6 +503,7 @@ IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, vo
m_pFtActualizeFile->Flush();
}
+
TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
: ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
{
@@ -530,11 +512,13 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
m_pEdit->GrabFocus();
}
+
TitleDialog::~TitleDialog()
{
disposeOnce();
}
+
void TitleDialog::dispose()
{
m_pEdit.clear();
@@ -542,9 +526,6 @@ void TitleDialog::dispose()
}
-// - GalleryIdDialog -
-
-
GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
: ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui")
, pThm(_pThm )
@@ -562,11 +543,13 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
}
+
GalleryIdDialog::~GalleryIdDialog()
{
disposeOnce();
}
+
void GalleryIdDialog::dispose()
{
m_pBtnOk.clear();
@@ -574,6 +557,7 @@ void GalleryIdDialog::dispose()
ModalDialog::dispose();
}
+
IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void)
{
Gallery* pGal = pThm->GetParent();
@@ -604,10 +588,6 @@ IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void)
}
-
-// - GalleryThemeProperties -
-
-
GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
ExchangeData* _pData, SfxItemSet* pItemSet)
: SfxTabDialog( pParent, "GalleryThemeDialog",
@@ -632,6 +612,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
SetText( aText );
}
+
void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
if (nId == m_nGeneralPageId)
@@ -640,7 +621,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<TPGalleryThemeProperties&>( rPage ).SetXChgData( pData );
}
-// - TPGalleryThemeGeneral -
+
TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "GalleryGeneralPage",
"cui/ui/gallerygeneralpage.ui", &rSet)
@@ -654,11 +635,13 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem
get(m_pFtMSShowChangeDate, "modified");
}
+
TPGalleryThemeGeneral::~TPGalleryThemeGeneral()
{
disposeOnce();
}
+
void TPGalleryThemeGeneral::dispose()
{
m_pFiMSImage.clear();
@@ -670,6 +653,7 @@ void TPGalleryThemeGeneral::dispose()
SfxTabPage::dispose();
}
+
void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
{
pData = _pData;
@@ -727,7 +711,6 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
}
-
bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
{
pData->aEditedTitle = m_pEdtMSName->GetText();
@@ -735,13 +718,12 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
}
-
VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet );
}
-// - TPGalleryThemeProperties -
+
TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet )
: SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
, pData(nullptr)
@@ -768,6 +750,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const
xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) );
}
+
void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
{
pData = _pData;
@@ -793,7 +776,6 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
}
-
void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult )
{
if ( RET_OK == _nDlgResult )
@@ -807,12 +789,12 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
}
-
TPGalleryThemeProperties::~TPGalleryThemeProperties()
{
disposeOnce();
}
+
void TPGalleryThemeProperties::dispose()
{
xMediaPlayer.clear();
@@ -833,11 +815,13 @@ void TPGalleryThemeProperties::dispose()
SfxTabPage::dispose();
}
+
VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet );
}
+
OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
{
OUString sAllFilter( "(*.*)" );
@@ -856,7 +840,6 @@ OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText,
}
-
void TPGalleryThemeProperties::FillFilterList()
{
GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
@@ -996,7 +979,6 @@ void TPGalleryThemeProperties::FillFilterList()
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void)
{
OUString aText( m_pCbbFileType->GetText() );
@@ -1011,7 +993,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, vo
}
-
void TPGalleryThemeProperties::SearchFiles()
{
SearchProgress* pProgress = VclPtr<SearchProgress>::Create( this, aURL );
@@ -1027,7 +1008,6 @@ void TPGalleryThemeProperties::SearchFiles()
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
{
if( bInputAllowed )
@@ -1066,7 +1046,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
}
-
void TPGalleryThemeProperties::TakeFiles()
{
if( m_pLbxFound->GetSelectEntryCount() || ( bTakeAll && bEntriesFound ) )
@@ -1081,7 +1060,6 @@ void TPGalleryThemeProperties::TakeFiles()
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
{
if ( bInputAllowed )
@@ -1101,7 +1079,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
}
-
void TPGalleryThemeProperties::DoPreview()
{
OUString aString( m_pLbxFound->GetSelectEntry() );
@@ -1130,7 +1107,6 @@ void TPGalleryThemeProperties::DoPreview()
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
{
if( bInputAllowed )
@@ -1155,7 +1131,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
{
if( bInputAllowed )
@@ -1167,7 +1142,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
{
if( bInputAllowed )
@@ -1198,7 +1172,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
{
if( bInputAllowed )
@@ -1211,7 +1184,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void)
{
aPreviewTimer.Stop();
@@ -1219,7 +1191,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void)
}
-
IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void)
{
if( !aFoundList.empty() )
@@ -1239,7 +1210,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, v
}
-
IMPL_LINK_TYPED( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void )
{
DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 66d9d1f920c6..2a9964b76a0f 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -28,6 +28,7 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc>
+
GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
const WinBits nStyle)
: Control(pParent, nStyle)
@@ -37,6 +38,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
{
}
+
VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow)
{
WinBits nWinBits = WB_TABSTOP;
@@ -48,11 +50,13 @@ VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow)
rRet = VclPtr<GraphicPreviewWindow>::Create(pParent, nWinBits);
}
+
Size GraphicPreviewWindow::GetOptimalSize() const
{
return LogicToPixel(Size(81, 73), MAP_APPFONT);
}
+
void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
Control::Paint(rRenderContext, rRect);
@@ -75,12 +79,14 @@ void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Recta
}
}
+
void GraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
{
maPreview = rGraphic;
Invalidate();
}
+
void GraphicPreviewWindow::ScaleImageToFit()
{
if (!mpOrigGraphic)
@@ -126,6 +132,7 @@ void GraphicPreviewWindow::ScaleImageToFit()
maModifyHdl.Call(nullptr);
}
+
void GraphicPreviewWindow::Resize()
{
Control::Resize();
@@ -149,11 +156,13 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
mpPreview->init(&rGraphic, maModifyHdl);
}
+
GraphicFilterDialog::~GraphicFilterDialog()
{
disposeOnce();
}
+
void GraphicFilterDialog::dispose()
{
mpPreview.clear();
@@ -169,7 +178,6 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
}
-
IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
{
if (bIsBitmap)
@@ -180,9 +188,6 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
}
-// - FilterMosaic -
-
-
GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges )
: GraphicFilterDialog(pParent, "MosaicDialog",
@@ -206,21 +211,25 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r
mpMtrWidth->GrabFocus();
}
+
IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void)
{
GetModifyHdl().Call(nullptr);
}
+
IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, void)
{
GetModifyHdl().Call(nullptr);
}
+
GraphicFilterMosaic::~GraphicFilterMosaic()
{
disposeOnce();
}
+
void GraphicFilterMosaic::dispose()
{
mpMtrWidth.clear();
@@ -229,6 +238,7 @@ void GraphicFilterMosaic::dispose()
GraphicFilterDialog::dispose();
}
+
Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
double fScaleX, double fScaleY )
{
@@ -266,9 +276,6 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
}
-// - GraphicFilterSmooth -
-
-
GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius)
: GraphicFilterDialog(pParent, "SmoothDialog",
"cui/ui/smoothdialog.ui", rGraphic)
@@ -280,16 +287,19 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r
mpMtrRadius->GrabFocus();
}
+
IMPL_LINK_NOARG_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, void)
{
GetModifyHdl().Call(nullptr);
}
+
GraphicFilterSmooth::~GraphicFilterSmooth()
{
disposeOnce();
}
+
void GraphicFilterSmooth::dispose()
{
mpMtrRadius.clear();
@@ -297,7 +307,7 @@ void GraphicFilterSmooth::dispose()
}
-Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double, double )
{
Graphic aRet;
BmpFilterParam aParam( GetRadius() );
@@ -325,9 +335,6 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
}
-// - GraphicFilterSolarize -
-
-
GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt8 cGreyThreshold, bool bInvert )
: GraphicFilterDialog(pParent, "SolarizeDialog",
@@ -343,20 +350,25 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi
mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) );
}
+
IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void)
{
GetModifyHdl().Call(nullptr);
}
+
+
IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, void)
{
GetModifyHdl().Call(nullptr);
}
+
GraphicFilterSolarize::~GraphicFilterSolarize()
{
disposeOnce();
}
+
void GraphicFilterSolarize::dispose()
{
mpMtrThreshold.clear();
@@ -365,8 +377,7 @@ void GraphicFilterSolarize::dispose()
}
-Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
- double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double, double )
{
Graphic aRet;
BmpFilterParam aParam( GetGreyThreshold() );
@@ -399,10 +410,6 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
return aRet;
}
-
-// - GraphicFilterSepia -
-
-
GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent )
: GraphicFilterDialog(pParent, "AgingDialog",
@@ -431,8 +438,7 @@ void GraphicFilterSepia::dispose()
}
-Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
- double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double, double )
{
Graphic aRet;
BmpFilterParam aParam( GetSepiaPercent() );
@@ -456,9 +462,6 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
}
-// - GraphicFilterPoster -
-
-
GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nPosterCount)
: GraphicFilterDialog(pParent, "PosterDialog",
@@ -472,16 +475,19 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG
mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) );
}
+
IMPL_LINK_NOARG_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, void)
{
GetModifyHdl().Call(nullptr);
}
+
GraphicFilterPoster::~GraphicFilterPoster()
{
disposeOnce();
}
+
void GraphicFilterPoster::dispose()
{
mpNumPoster.clear();
@@ -489,8 +495,7 @@ void GraphicFilterPoster::dispose()
}
-Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
- double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double, double )
{
Graphic aRet;
const sal_uInt16 nPosterCount = GetPosterColorCount();
@@ -514,9 +519,6 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
}
-// - GraphicFilterEmboss -
-
-
void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
{
const RECT_POINT eOldRP = GetActualRP();
@@ -527,13 +529,16 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
maModifyHdl.Call( nullptr );
}
+
Size EmbossControl::GetOptimalSize() const
{
return LogicToPixel(Size(77, 60), MAP_APPFONT);
}
+
VCL_BUILDER_FACTORY(EmbossControl)
+
GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource)
: GraphicFilterDialog (pParent, "EmbossDialog",
@@ -545,11 +550,13 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
mpCtlLight->GrabFocus();
}
+
GraphicFilterEmboss::~GraphicFilterEmboss()
{
disposeOnce();
}
+
void GraphicFilterEmboss::dispose()
{
mpCtlLight.clear();
@@ -557,8 +564,7 @@ void GraphicFilterEmboss::dispose()
}
-Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
- double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double, double )
{
Graphic aRet;
sal_uInt16 nAzim, nElev;
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 3f97629ca601..57c8249652d7 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -44,8 +44,9 @@
#include <memory>
-namespace dbaxml
-{
+
+namespace dbaxml {
+
using namespace ::xmloff::token;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -56,9 +57,10 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-// - ODBExport -
+
#define PROGRESS_BAR_STEP 20
+
class ODBExport : public SvXMLExport
{
typedef ::std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 640111316075..bd1d661c2a2a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -69,6 +69,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODBFilter( )
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration;
}
+
namespace dbaxml
{
sal_Char const sXML_np__db[] = "_db";
@@ -137,6 +138,7 @@ sal_Int32 ReadThroughComponent(
return 0;
}
+
/// read a component (storage version)
sal_Int32 ReadThroughComponent(
uno::Reference< embed::XStorage > xStorage,
@@ -201,7 +203,6 @@ sal_Int32 ReadThroughComponent(
return 1;
}
-// - ODBFilter -
ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
: SvXMLImport(_rxContext, getImplementationName_Static())
@@ -219,17 +220,20 @@ ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
XML_NAMESPACE_DB );
}
+
ODBFilter::~ODBFilter() throw()
{
}
+
OUString ODBFilter::getImplementationName_Static()
throw (css::uno::RuntimeException)
{
return OUString("com.sun.star.comp.sdb.DBFilter");
}
+
css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
throw (css::uno::RuntimeException)
{
@@ -237,12 +241,14 @@ css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
return s;
}
+
css::uno::Reference< css::uno::XInterface >
SAL_CALL ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB)));
}
+
sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException, std::exception)
{
@@ -270,6 +276,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
return bRet;
}
+
bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException, std::exception)
{
@@ -377,6 +384,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
return bRet;
}
+
SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
@@ -413,6 +421,7 @@ SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
return pContext;
}
+
void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
{
const PropertyValue *pIter = aViewProps.getConstArray();
@@ -430,6 +439,7 @@ void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
}
}
+
void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigProps)
{
const PropertyValue *pIter = aConfigProps.getConstArray();
@@ -447,6 +457,7 @@ void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigP
}
}
+
void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
{
Sequence<PropertyValue> aWindows;
@@ -462,6 +473,7 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
}
+
const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
@@ -484,6 +496,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
return *m_pDocElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
if ( !m_pDatabaseElemTokenMap.get() )
@@ -504,6 +517,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
return *m_pDatabaseElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
if ( !m_pDataSourceElemTokenMap.get() )
@@ -555,6 +569,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
return *m_pDataSourceElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
if ( !m_pLoginElemTokenMap.get() )
@@ -572,6 +587,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
return *m_pLoginElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
if ( !m_pDatabaseDescriptionElemTokenMap.get() )
@@ -587,6 +603,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
return *m_pDatabaseDescriptionElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
if ( !m_pDataSourceInfoElemTokenMap.get() )
@@ -613,6 +630,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
return *m_pDataSourceInfoElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
if ( !m_pDocumentsElemTokenMap.get() )
@@ -633,6 +651,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
return *m_pDocumentsElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
@@ -652,6 +671,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
return *m_pComponentElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
if ( !m_pQueryElemTokenMap.get() )
@@ -676,6 +696,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
return *m_pQueryElemTokenMap;
}
+
const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
if ( !m_pColumnElemTokenMap.get() )
@@ -697,6 +718,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
return *m_pColumnElemTokenMap;
}
+
SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUString& rLocalName,
const uno::Reference< XAttributeList>& xAttrList, bool bIsAutoStyle )
{
@@ -709,11 +731,13 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUS
return pContext;
}
+
SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName )
{
return new XMLScriptContext( *this, XML_NAMESPACE_OFFICE, _rLocalName, GetModel() );
}
+
rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const
{
if ( !m_xTableStylesPropertySetMapper.is() )
@@ -723,6 +747,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapp
return m_xTableStylesPropertySetMapper;
}
+
rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const
{
if ( !m_xColumnStylesPropertySetMapper.is() )
@@ -732,6 +757,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMap
return m_xColumnStylesPropertySetMapper;
}
+
rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const
{
if ( !m_xCellStylesPropertySetMapper.is() )
@@ -741,6 +767,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMappe
return m_xCellStylesPropertySetMapper;
}
+
void ODBFilter::setPropertyInfo()
{
Reference<XPropertySet> xDataSource(getDataSource());
@@ -770,6 +797,6 @@ void ODBFilter::setPropertyInfo()
}
}
-}// dbaxml
+} // namespace dbaxml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 32df1c170c3e..2b3daecfad21 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -41,8 +41,10 @@
#include <map>
#include <memory>
+
namespace dbaxml
{
+
using namespace ::xmloff::token;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -53,7 +55,7 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-// - ODBFilter -
+
class ODBFilter : public SvXMLImport
{
public:
@@ -155,7 +157,7 @@ public:
inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
};
-} // dbaxml
+} // namespace dbaxml
#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index e84ce92afa4a..46c74854f246 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -4,7 +4,7 @@
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http: // mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
@@ -14,7 +14,7 @@
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ * the License at http: // www.apache.org/licenses/LICENSE-2.0 .
*/
#include <com/sun/star/uno/Any.hxx>
@@ -89,6 +89,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::table::BorderLineStyle;
+
/*
SvxBorderLine is not an SfxPoolItem, and has no Store/Create serialization/deserialization methods.
Since border line information needs to be serialized by the table autoformat code, these file-local
@@ -115,6 +116,7 @@ namespace
return stream;
}
+
/// Creates a border line from a stream.
SvxBorderLine CreateBorderLine(SvStream &stream, sal_uInt16 version)
{
@@ -131,6 +133,7 @@ namespace
return border;
}
+
/// Retrieves a BORDER_LINE_* version from a BOX_BORDER_* version.
sal_uInt16 BorderLineVersionFromBoxVersion(sal_uInt16 boxVersion)
{
@@ -156,15 +159,12 @@ SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);}
SfxPoolItem* SvxFrameDirectionItem::CreateDefault() { return new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0);}
-// class SvxPaperBinItem ------------------------------------------------
-
SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
{
return new SvxPaperBinItem( *this );
}
-
SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteUChar( GetValue() );
@@ -172,7 +172,6 @@ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
}
-
SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 nBin;
@@ -181,7 +180,6 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
}
-
bool SvxPaperBinItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -209,13 +207,12 @@ bool SvxPaperBinItem::GetPresentation
return true;
}
//no break necessary
- default: ;//prevent warning
+ default: ; //prevent warning
}
return false;
}
-// class SvxSizeItem -----------------------------------------------------
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
@@ -249,6 +246,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
return true;
}
+
bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -299,7 +297,6 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
SfxPoolItem( nId )
@@ -307,7 +304,6 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
}
-
bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -316,14 +312,12 @@ bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
}
-
SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const
{
return new SvxSizeItem( *this );
}
-
bool SvxSizeItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -350,15 +344,14 @@ bool SvxSizeItem::GetPresentation
GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) +
" " + EE_RESSTR(GetMetricId(ePresUnit));
return true;
- //no break necessary
- default: ;//prevent warning
+ // no break necessary
+ default: ; // prevent warning
}
return false;
}
-
SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteInt32( aSize.Width() );
@@ -367,7 +360,6 @@ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
}
-
void SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
{
aSize.Width() = Scale( aSize.Width(), nMult, nDiv );
@@ -375,14 +367,12 @@ void SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
}
-
bool SvxSizeItem::HasMetrics() const
{
return true;
}
-
SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int32 nWidth(0), nHeight(0);
@@ -394,7 +384,6 @@ SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const
return pAttr;
}
-// class SvxLRSpaceItem --------------------------------------------------
SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) :
@@ -414,12 +403,10 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) :
}
-
SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
const long nTLeft, const short nOfset,
- const sal_uInt16 nId ) :
-
- SfxPoolItem( nId ),
+ const sal_uInt16 nId )
+: SfxPoolItem( nId ),
nTxtLeft ( nTLeft ),
nLeftMargin ( nLeft ),
@@ -538,9 +525,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
-// Adapt nLeftMargin and nTxtLeft.
-
+/// Adapt nLeftMargin and nTxtLeft.
void SvxLRSpaceItem::AdjustLeft()
{
if ( 0 > nFirstLineOfst )
@@ -550,7 +535,6 @@ void SvxLRSpaceItem::AdjustLeft()
}
-
bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -571,14 +555,12 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
}
-
SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const
{
return new SvxLRSpaceItem( *this );
}
-
bool SvxLRSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -660,17 +642,18 @@ bool SvxLRSpaceItem::GetPresentation
}
return true;
}
- default: ;//prevent warning
+ default: ; // prevent warning
}
return false;
}
-
-// BulletFI: Before 501 in the Outliner the bullet was not on the position of
-// the FI, so in older documents one must set FI to 0.
+/** @attention BulletFI: Before v501 in the Outliner the bullet was not on the position of
+ the FI, so in older documents one must set FI to 0.
+ */
#define BULLETLR_MARKER 0x599401FE
+
SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
short nSaveFI = nFirstLineOfst;
@@ -720,7 +703,6 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
}
-
SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
sal_uInt16 left, prpleft, right, prpright, prpfirstline, txtleft;
@@ -784,7 +766,6 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
}
-
sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
{
return (nFileVersion == SOFFICE_FILEFORMAT_31)
@@ -793,7 +774,6 @@ sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
}
-
void SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
{
nFirstLineOfst = (short)Scale( nFirstLineOfst, nMult, nDiv );
@@ -803,12 +783,12 @@ void SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
}
-
bool SvxLRSpaceItem::HasMetrics() const
{
return true;
}
+
void SvxLRSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("svxLRSpaceItem"));
@@ -826,7 +806,6 @@ void SvxLRSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-// class SvxULSpaceItem --------------------------------------------------
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
: SfxPoolItem(nId)
@@ -839,7 +818,6 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
}
-
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
const sal_uInt16 nId )
: SfxPoolItem(nId)
@@ -852,7 +830,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
}
-bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -941,7 +919,6 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -955,14 +932,12 @@ bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
}
-
SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const
{
return new SvxULSpaceItem( *this );
}
-
bool SvxULSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -1021,13 +996,12 @@ bool SvxULSpaceItem::GetPresentation
}
return true;
}
- default: ;//prevent warning
+ default: ; // prevent warning
}
return false;
}
-
SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteUInt16( GetUpper() )
@@ -1038,7 +1012,6 @@ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
}
-
SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
sal_uInt16 upper, lower, nPL = 0, nPU = 0;
@@ -1062,14 +1035,12 @@ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
}
-
sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
{
return ULSPACE_16_VERSION;
}
-
void SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
{
nUpper = (sal_uInt16)Scale( nUpper, nMult, nDiv );
@@ -1077,12 +1048,12 @@ void SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
}
-
bool SvxULSpaceItem::HasMetrics() const
{
return true;
}
+
void SvxULSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("svxULSpaceItem"));
@@ -1095,7 +1066,6 @@ void SvxULSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-// class SvxPrintItem ----------------------------------------------------
SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
{
@@ -1103,7 +1073,6 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
}
-
SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
@@ -1111,7 +1080,6 @@ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c
}
-
SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsPrint;
@@ -1120,7 +1088,6 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
}
-
bool SvxPrintItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1137,7 +1104,6 @@ bool SvxPrintItem::GetPresentation
return true;
}
-// class SvxOpaqueItem ---------------------------------------------------
SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
{
@@ -1145,7 +1111,6 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
}
-
SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
@@ -1153,7 +1118,6 @@ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
}
-
SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsOpaque;
@@ -1162,7 +1126,6 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
}
-
bool SvxOpaqueItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1179,7 +1142,6 @@ bool SvxOpaqueItem::GetPresentation
return true;
}
-// class SvxProtectItem --------------------------------------------------
bool SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
{
@@ -1191,6 +1153,7 @@ bool SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
bPos == rItem.bPos );
}
+
bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -1209,7 +1172,8 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
return true;
}
-bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+
+bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
bool bVal( Any2Bool(rVal) );
@@ -1226,14 +1190,12 @@ bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const
{
return new SvxProtectItem( *this );
}
-
bool SvxProtectItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1261,7 +1223,6 @@ bool SvxProtectItem::GetPresentation
}
-
SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
sal_Int8 cProt = 0;
@@ -1273,7 +1234,6 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
}
-
SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 cFlags;
@@ -1285,6 +1245,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
return pAttr;
}
+
void SvxProtectItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("svxProtectItem"));
@@ -1295,7 +1256,6 @@ void SvxProtectItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-// class SvxShadowItem ---------------------------------------------------
SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
const Color *pColor, const sal_uInt16 nW,
@@ -1323,7 +1283,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case SVX_SHADOW_TOPRIGHT : eSet = table::ShadowLocation_TOP_RIGHT ; break;
case SVX_SHADOW_BOTTOMLEFT : eSet = table::ShadowLocation_BOTTOM_LEFT ; break;
case SVX_SHADOW_BOTTOMRIGHT: eSet = table::ShadowLocation_BOTTOM_RIGHT; break;
- default: ;//prevent warning
+ default: ; // prevent warning
}
aShadow.Location = eSet;
aShadow.ShadowWidth = bConvert ? convertTwipToMm100(nWidth) : nWidth;
@@ -1396,7 +1356,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case table::ShadowLocation_TOP_RIGHT : eLocation = SVX_SHADOW_TOPRIGHT; break;
case table::ShadowLocation_BOTTOM_LEFT : eLocation = SVX_SHADOW_BOTTOMLEFT ; break;
case table::ShadowLocation_BOTTOM_RIGHT: eLocation = SVX_SHADOW_BOTTOMRIGHT; break;
- default: ;//prevent warning
+ default: ; // prevent warning
}
nWidth = bConvert ? convertMm100ToTwip(aShadow.ShadowWidth) : aShadow.ShadowWidth;
@@ -1509,7 +1469,7 @@ bool SvxShadowItem::GetPresentation
EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
return true;
}
- default: ;//prevent warning
+ default: ; // prevent warning
}
return false;
}
@@ -2215,7 +2175,7 @@ bool SvxBoxItem::GetPresentation
}
return true;
}
- default: ;//prevent warning
+ default: ; // prevent warning
}
return false;
}
@@ -2975,7 +2935,7 @@ bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) c
case SVX_BREAK_PAGE_BEFORE: eBreak = style::BreakType_PAGE_BEFORE ; break;
case SVX_BREAK_PAGE_AFTER: eBreak = style::BreakType_PAGE_AFTER ; break;
case SVX_BREAK_PAGE_BOTH: eBreak = style::BreakType_PAGE_BOTH ; break;
- default: ;//prevent warning
+ default: ; // prevent warning
}
rVal <<= eBreak;
return true;
@@ -3003,7 +2963,7 @@ bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
case style::BreakType_PAGE_BEFORE: eBreak = SVX_BREAK_PAGE_BEFORE; break;
case style::BreakType_PAGE_AFTER: eBreak = SVX_BREAK_PAGE_AFTER; break;
case style::BreakType_PAGE_BOTH: eBreak = SVX_BREAK_PAGE_BOTH; break;
- default: ;//prevent warning
+ default: ; // prevent warning
}
SetValue((sal_uInt16) eBreak);
@@ -3011,14 +2971,12 @@ bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
}
-
SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
{
return new SvxFormatBreakItem( *this );
}
-
SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
rStrm.WriteSChar( GetValue() );
@@ -3028,7 +2986,6 @@ SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
}
-
sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -3040,7 +2997,6 @@ sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
}
-
SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
sal_Int8 eBreak, bDummy;
@@ -3051,13 +3007,11 @@ SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion )
}
-
sal_uInt16 SvxFormatBreakItem::GetValueCount() const
{
return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1
}
-// class SvxFormatKeepItem -------------------------------------------------
SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
{
@@ -3065,7 +3019,6 @@ SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
}
-
SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
@@ -3073,7 +3026,6 @@ SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
}
-
SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsKeep;
@@ -3082,7 +3034,6 @@ SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
}
-
bool SvxFormatKeepItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -3099,7 +3050,6 @@ bool SvxFormatKeepItem::GetPresentation
return true;
}
-// class SvxLineItem ------------------------------------------------------
SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
@@ -3110,7 +3060,6 @@ SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
}
-
SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) :
SfxPoolItem ( rCpy )
@@ -3119,14 +3068,12 @@ SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) :
}
-
SvxLineItem::~SvxLineItem()
{
delete pLine;
}
-
SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine )
{
SetLine( rLine.GetLine() );
@@ -3135,7 +3082,6 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine )
}
-
bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -3144,12 +3090,12 @@ bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
}
-
SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
{
return new SvxLineItem( *this );
}
+
bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
{
bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
@@ -3177,7 +3123,6 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
}
-
bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
{
bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
@@ -3219,7 +3164,6 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
}
-
bool SvxLineItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -3237,7 +3181,6 @@ bool SvxLineItem::GetPresentation
}
-
SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
if( pLine )
@@ -3256,21 +3199,18 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
}
-
void SvxLineItem::ScaleMetrics( long nMult, long nDiv )
{
if ( pLine ) pLine->ScaleMetrics( nMult, nDiv );
}
-
bool SvxLineItem::HasMetrics() const
{
return true;
}
-
SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
SvxLineItem* _pLine = new SvxLineItem( Which() );
@@ -3288,20 +3228,17 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
}
-
void SvxLineItem::SetLine( const SvxBorderLine* pNew )
{
delete pLine;
pLine = pNew ? new SvxBorderLine( *pNew ) : nullptr;
}
-// class SvxBrushItem ----------------------------------------------------
#define LOAD_GRAPHIC ((sal_uInt16)0x0001)
#define LOAD_LINK ((sal_uInt16)0x0002)
#define LOAD_FILTER ((sal_uInt16)0x0004)
-// class SvxBrushItem_Impl -----------------------------------------------
class SvxBrushItem_Impl
{
@@ -3315,7 +3252,6 @@ public:
};
-
SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich ),
@@ -3332,7 +3268,6 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
}
-
SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) :
SfxPoolItem( _nWhich ),
@@ -3349,7 +3284,6 @@ SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) :
}
-
SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos,
sal_uInt16 _nWhich ) :
@@ -3368,7 +3302,6 @@ SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos,
}
-
SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj,
SvxGraphicPosition ePos, sal_uInt16 _nWhich ) :
@@ -3387,7 +3320,6 @@ SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj,
}
-
SvxBrushItem::SvxBrushItem(
const OUString& rLink, const OUString& rFilter,
SvxGraphicPosition ePos, sal_uInt16 _nWhich ) :
@@ -3407,7 +3339,6 @@ SvxBrushItem::SvxBrushItem(
}
-
SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
sal_uInt16 _nWhich )
: SfxPoolItem( _nWhich )
@@ -3431,7 +3362,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
switch ( nStyle )
{
- case 8://BRUSH_25:
+ case 8: // BRUSH_25:
{
sal_uInt32 nRed = aTempColor.GetRed();
sal_uInt32 nGreen = aTempColor.GetGreen();
@@ -3443,7 +3374,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
}
break;
- case 9://BRUSH_50:
+ case 9: // BRUSH_50:
{
sal_uInt32 nRed = aTempColor.GetRed();
sal_uInt32 nGreen = aTempColor.GetGreen();
@@ -3455,7 +3386,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
}
break;
- case 10://BRUSH_75:
+ case 10: // BRUSH_75:
{
sal_uInt32 nRed = aTempColor.GetRed()*2;
sal_uInt32 nGreen = aTempColor.GetGreen()*2;
@@ -3467,7 +3398,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
}
break;
- case 0://BRUSH_NULL:
+ case 0: // BRUSH_NULL:
aColor = Color( COL_TRANSPARENT );
break;
@@ -3522,7 +3453,6 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
}
-
SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
SfxPoolItem( rItem.Which() ),
@@ -3538,14 +3468,12 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
}
-
SvxBrushItem::~SvxBrushItem()
{
delete pImpl->pGraphicObject;
}
-
sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
{
return BRUSH_GRAPHIC_VERSION;
@@ -3554,14 +3482,17 @@ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
static inline sal_Int8 lcl_PercentToTransparency(long nPercent)
{
- //0xff must not be returned!
+ // 0xff must not be returned!
return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0);
}
+
+
sal_Int8 SvxBrushItem::TransparencyToPercent(sal_Int32 nTrans)
{
return (sal_Int8)((nTrans * 100 + 127) / 254);
}
+
bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -3627,7 +3558,6 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
-
bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
@@ -3748,7 +3678,6 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
bool SvxBrushItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -3775,7 +3704,6 @@ bool SvxBrushItem::GetPresentation
}
-
SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem )
{
aColor = rItem.aColor;
@@ -3802,7 +3730,6 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem )
}
-
bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -3842,21 +3769,18 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
}
-
SfxPoolItem* SvxBrushItem::Clone( SfxItemPool* ) const
{
return new SvxBrushItem( *this );
}
-
SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) const
{
return new SvxBrushItem( rStream, nVersion, Which() );
}
-
SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
{
rStream.WriteBool( false );
@@ -3894,12 +3818,12 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
}
-
void SvxBrushItem::PurgeMedium() const
{
DELETEZ( pImpl->pStream );
}
+
const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) const
{
if ( bLoadAgain && !maStrLink.isEmpty() && !pImpl->pGraphicObject )
@@ -3965,14 +3889,13 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
return pImpl->pGraphicObject;
}
-//UUUU
+
sal_Int8 SvxBrushItem::getGraphicTransparency() const
{
return pImpl->nGraphicTransparency;
}
-// -----------------------------------------------------------------------
-//UUUU
+
void SvxBrushItem::setGraphicTransparency(sal_Int8 nNew)
{
if(nNew != pImpl->nGraphicTransparency)
@@ -3982,8 +3905,6 @@ void SvxBrushItem::setGraphicTransparency(sal_Int8 nNew)
}
}
-// -----------------------------------------------------------------------
-
const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const
{
@@ -3992,7 +3913,6 @@ const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const
}
-
void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew )
{
eGraphicPos = eNew;
@@ -4013,7 +3933,6 @@ void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew )
}
-
void SvxBrushItem::SetGraphic( const Graphic& rNew )
{
if ( maStrLink.isEmpty() )
@@ -4035,7 +3954,6 @@ void SvxBrushItem::SetGraphic( const Graphic& rNew )
}
-
void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj )
{
if ( maStrLink.isEmpty() )
@@ -4057,7 +3975,6 @@ void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj )
}
-
void SvxBrushItem::SetGraphicLink( const OUString& rNew )
{
if ( rNew.isEmpty() )
@@ -4070,22 +3987,22 @@ void SvxBrushItem::SetGraphicLink( const OUString& rNew )
}
-
void SvxBrushItem::SetGraphicFilter( const OUString& rNew )
{
maStrFilter = rNew;
}
+
void SvxBrushItem::SetShadingValue( const sal_Int32 nNew )
{
nShadingValue = nNew;
}
-//static
+
SvxGraphicPosition SvxBrushItem::WallpaperStyle2GraphicPos( WallpaperStyle eStyle )
{
SvxGraphicPosition eResult;
- // The switch is not the fastest, but the safest
+ // This switch is not the fastest, but the safest
switch( eStyle )
{
case WallpaperStyle::NONE: eResult = GPOS_NONE; break;
@@ -4105,7 +4022,7 @@ SvxGraphicPosition SvxBrushItem::WallpaperStyle2GraphicPos( WallpaperStyle eStyl
return eResult;
};
-//static
+
WallpaperStyle SvxBrushItem::GraphicPos2WallpaperStyle( SvxGraphicPosition ePos )
{
WallpaperStyle eResult;
@@ -4128,6 +4045,7 @@ WallpaperStyle SvxBrushItem::GraphicPos2WallpaperStyle( SvxGraphicPosition ePos
return eResult;
}
+
SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich ) :
SfxPoolItem ( _nWhich ),
nShadingValue ( ShadingPattern::CLEAR ),
@@ -4149,6 +4067,7 @@ SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich )
}
}
+
void SvxBrushItem::ApplyGraphicTransparency_Impl()
{
DBG_ASSERT(pImpl->pGraphicObject, "no GraphicObject available" );
@@ -4161,6 +4080,7 @@ void SvxBrushItem::ApplyGraphicTransparency_Impl()
}
}
+
void SvxBrushItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("svxBrushItem"));
@@ -4174,7 +4094,6 @@ void SvxBrushItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-// class SvxFrameDirectionItem ----------------------------------------------
SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
sal_uInt16 _nWhich )
@@ -4182,10 +4101,12 @@ SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
{
}
+
SvxFrameDirectionItem::~SvxFrameDirectionItem()
{
}
+
bool SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" );
@@ -4193,11 +4114,13 @@ bool SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const
return GetValue() == static_cast<const SvxFrameDirectionItem&>(rCmp).GetValue();
}
+
SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
{
return new SvxFrameDirectionItem( *this );
}
+
SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
{
sal_uInt16 nValue;
@@ -4205,6 +4128,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*
return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
}
+
SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
{
sal_uInt16 nValue = GetValue();
@@ -4212,11 +4136,13 @@ SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ )
return rStrm;
}
+
sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
}
+
bool SvxFrameDirectionItem::GetPresentation(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -4227,6 +4153,7 @@ bool SvxFrameDirectionItem::GetPresentation(
return true;
}
+
bool SvxFrameDirectionItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 )
{
@@ -4261,6 +4188,7 @@ bool SvxFrameDirectionItem::PutValue( const css::uno::Any& rVal,
return bRet;
}
+
bool SvxFrameDirectionItem::QueryValue( css::uno::Any& rVal,
sal_uInt8 ) const
{
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 893ee1a15b16..35f2844a127f 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -180,13 +180,13 @@ void SvxRTFParser::NextToken( int nToken )
case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
- case RTF_EMDASH: cCh = 0x2014; goto INSINGLECHAR;
- case RTF_ENDASH: cCh = 0x2013; goto INSINGLECHAR;
- case RTF_BULLET: cCh = 0x2022; goto INSINGLECHAR;
- case RTF_LQUOTE: cCh = 0x2018; goto INSINGLECHAR;
- case RTF_RQUOTE: cCh = 0x2019; goto INSINGLECHAR;
- case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR;
- case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
+ case RTF_EMDASH: cCh = 0x2014; goto INSINGLECHAR;
+ case RTF_ENDASH: cCh = 0x2013; goto INSINGLECHAR;
+ case RTF_BULLET: cCh = 0x2022; goto INSINGLECHAR;
+ case RTF_LQUOTE: cCh = 0x2018; goto INSINGLECHAR;
+ case RTF_RQUOTE: cCh = 0x2019; goto INSINGLECHAR;
+ case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR;
+ case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
INSINGLECHAR:
aToken = OUString(cCh);
// no Break, aToken is set as Text
diff --git a/extensions/source/macosx/spotlight/main.m b/extensions/source/macosx/spotlight/main.m
index 6457ff7127c6..d3c3f44c80c0 100644
--- a/extensions/source/macosx/spotlight/main.m
+++ b/extensions/source/macosx/spotlight/main.m
@@ -37,9 +37,7 @@
#include "GetMetadataForFile.h"
-// -----------------------------------------------------------------------------
// constants
-// -----------------------------------------------------------------------------
#define PLUGIN_ID "A3FCC88D-B9A6-4364-8B93-92123C8A2D18"
@@ -52,9 +50,7 @@
//
-// -----------------------------------------------------------------------------
// typedefs
-// -----------------------------------------------------------------------------
// The layout for an instance of MetaDataImporterPlugIn
typedef struct __MetadataImporterPluginType
@@ -64,9 +60,7 @@ typedef struct __MetadataImporterPluginType
UInt32 refCount;
} MetadataImporterPluginType;
-// -----------------------------------------------------------------------------
// prototypes
-// -----------------------------------------------------------------------------
// Forward declaration for the IUnknown implementation.
//
@@ -75,9 +69,7 @@ void DeallocMetadataImporterPluginType(MetadataImporterPlug
HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv);
ULONG MetadataImporterPluginAddRef(void *thisInstance);
ULONG MetadataImporterPluginRelease(void *thisInstance);
-// -----------------------------------------------------------------------------
// testInterfaceFtbl definition
-// -----------------------------------------------------------------------------
// The TestInterface function table.
//
@@ -90,9 +82,7 @@ static MDImporterInterfaceStruct testInterfaceFtbl = {
};
-// -----------------------------------------------------------------------------
// AllocMetadataImporterPluginType
-// -----------------------------------------------------------------------------
// Utility function that allocates a new instance.
// You can do some initial setup for the importer here if you wish
// like allocating globals etc...
@@ -116,9 +106,7 @@ MetadataImporterPluginType *AllocMetadataImporterPluginType(CFUUIDRef inFactoryI
return theNewInstance;
}
-// -----------------------------------------------------------------------------
// DeallocSpotlightTesterMDImporterPluginType
-// -----------------------------------------------------------------------------
// Utility function that deallocates the instance when
// the refCount goes to zero.
// In the current implementation importer interfaces are never deallocated
@@ -136,9 +124,7 @@ void DeallocMetadataImporterPluginType(MetadataImporterPluginType *thisInstance)
}
}
-// -----------------------------------------------------------------------------
// MetadataImporterQueryInterface
-// -----------------------------------------------------------------------------
// Implementation of the IUnknown QueryInterface function.
//
HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv)
@@ -172,9 +158,7 @@ HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv
}
}
-// -----------------------------------------------------------------------------
// MetadataImporterPluginAddRef
-// -----------------------------------------------------------------------------
// Implementation of reference counting for this type. Whenever an interface
// is requested, bump the refCount for the instance. NOTE: returning the
// refcount is a convention but is not required so don't rely on it.
@@ -185,9 +169,7 @@ ULONG MetadataImporterPluginAddRef(void *thisInstance)
return ((MetadataImporterPluginType*) thisInstance)->refCount;
}
-// -----------------------------------------------------------------------------
// SampleCMPluginRelease
-// -----------------------------------------------------------------------------
// When an interface is released, decrement the refCount.
// If the refCount goes to zero, deallocate the instance.
//
@@ -202,9 +184,7 @@ ULONG MetadataImporterPluginRelease(void *thisInstance)
}
}
-// -----------------------------------------------------------------------------
// SpotlightTesterMDImporterPluginFactory
-// -----------------------------------------------------------------------------
// Implementation of the factory function for this type.
//
__attribute__ ((visibility("default")))
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index b96e89cced3a..1257cf32824c 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -26,9 +26,6 @@
#include <scanner.hxx>
-// - BitmapTransporter -
-
-
class BitmapTransporter: public cppu::WeakImplHelper<css::awt::XBitmap>
{
SvMemoryStream m_aStream;
@@ -50,9 +47,6 @@ public:
};
-// - Sane -
-
-
class Sane
{
private:
@@ -165,6 +159,7 @@ public:
inline Link<Sane&,void> SetReloadOptionsHdl( const Link<Sane&,void>& rLink );
};
+
inline int Sane::GetOptionElements( int n )
{
if( mppOptions[n]->type == SANE_TYPE_FIXED ||
@@ -175,6 +170,7 @@ inline int Sane::GetOptionElements( int n )
return 1;
}
+
inline Link<Sane&,void> Sane::SetReloadOptionsHdl( const Link<Sane&,void>& rLink )
{
Link<Sane&,void> aRet = maReloadOptionsLink;
@@ -182,6 +178,6 @@ inline Link<Sane&,void> Sane::SetReloadOptionsHdl( const Link<Sane&,void>& rLink
return aRet;
}
-#endif
+#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 2cf61f5d5f53..5e4c5d6b0fce 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -21,8 +21,6 @@
#include <cppuhelper/supportsservice.hxx>
-// - ScannerManager -
-
Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception )
{
@@ -30,7 +28,6 @@ Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference<
}
-
ScannerManager::ScannerManager() :
mpData( nullptr )
{
@@ -38,48 +35,52 @@ ScannerManager::ScannerManager() :
}
-
ScannerManager::~ScannerManager()
{
ReleaseData();
}
+
Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw(std::exception)
{
return Sequence< sal_Int8 >();
}
+
OUString ScannerManager::getImplementationName()
throw (css::uno::RuntimeException, std::exception)
{
return getImplementationName_Static();
}
+
sal_Bool ScannerManager::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
+
css::uno::Sequence<OUString> ScannerManager::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
+
OUString ScannerManager::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.scanner.ScannerManager" );
}
-
Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
{
Sequence< OUString > aSNS { "com.sun.star.scanner.ScannerManager" };
return aSNS;
}
+
sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException, std::exception )
{
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index aae2b25f6e27..33075998caa0 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -34,6 +34,7 @@ BitmapTransporter::BitmapTransporter()
#endif
}
+
BitmapTransporter::~BitmapTransporter()
{
#if OSL_DEBUG_LEVEL > 1
@@ -41,6 +42,7 @@ BitmapTransporter::~BitmapTransporter()
#endif
}
+
css::awt::Size BitmapTransporter::getSize() throw(std::exception)
{
osl::MutexGuard aGuard( m_aProtector );
@@ -64,7 +66,6 @@ css::awt::Size BitmapTransporter::getSize() throw(std::exception)
}
-
Sequence< sal_Int8 > BitmapTransporter::getDIB() throw(std::exception)
{
osl::MutexGuard aGuard( m_aProtector );
@@ -83,9 +84,6 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB() throw(std::exception)
}
-// - SaneHolder -
-
-
struct SaneHolder
{
Sane m_aSane;
@@ -97,6 +95,7 @@ struct SaneHolder
SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
};
+
namespace
{
typedef std::vector< std::shared_ptr<SaneHolder> > sanevec;
@@ -130,9 +129,6 @@ namespace
}
-// - ScannerThread -
-
-
class ScannerThread : public osl::Thread
{
std::shared_ptr<SaneHolder> m_pHolder;
@@ -150,7 +146,6 @@ public:
};
-
ScannerThread::ScannerThread(
std::shared_ptr<SaneHolder> pHolder,
const Reference< css::lang::XEventListener >& listener,
@@ -162,6 +157,7 @@ ScannerThread::ScannerThread(
#endif
}
+
ScannerThread::~ScannerThread()
{
#if OSL_DEBUG_LEVEL > 1
@@ -169,6 +165,7 @@ ScannerThread::~ScannerThread()
#endif
}
+
void ScannerThread::run()
{
osl_setThreadName("ScannerThread");
@@ -200,15 +197,13 @@ void ScannerThread::run()
}
-// - ScannerManager -
-
-
void ScannerManager::AcquireData()
{
osl::MutexGuard aGuard( theSaneProtector::get() );
theSanes::get().acquire();
}
+
void ScannerManager::ReleaseData()
{
osl::MutexGuard aGuard( theSaneProtector::get() );
@@ -216,7 +211,6 @@ void ScannerManager::ReleaseData()
}
-
css::awt::Size ScannerManager::getSize() throw(std::exception)
{
css::awt::Size aRet;
@@ -225,14 +219,12 @@ css::awt::Size ScannerManager::getSize() throw(std::exception)
}
-
Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception)
{
return Sequence< sal_Int8 >();
}
-
Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exception)
{
osl::MutexGuard aGuard( theSaneProtector::get() );
@@ -257,7 +249,6 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc
}
-
sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context,
const Reference< css::lang::XEventListener >& listener )
throw (ScannerException, RuntimeException, std::exception)
@@ -300,7 +291,6 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
}
-
void ScannerManager::startScan( const ScannerContext& scanner_context,
const Reference< css::lang::XEventListener >& listener ) throw( ScannerException, std::exception )
{
@@ -331,7 +321,6 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
}
-
ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception )
{
osl::MutexGuard aGuard( theSaneProtector::get() );
@@ -350,7 +339,6 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
}
-
Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception )
{
osl::MutexGuard aGuard( theSaneProtector::get() );
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 120bdcd030b4..3bca31968594 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -24,10 +24,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-
-// - ImpPDFDialog -
-
-
ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) :
ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ),
@@ -57,12 +53,12 @@ ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi
}
-
ImpSWFDialog::~ImpSWFDialog()
{
disposeOnce();
}
+
void ImpSWFDialog::dispose()
{
mpNumFldQuality.clear();
@@ -95,7 +91,8 @@ Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
return aRet;
}
-// AS: This is called whenever the user toggles one of the checkboxes
+
+/// This is called whenever the user toggles one of the checkboxes
IMPL_LINK_TYPED( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void )
{
if (&rBox == mpCheckExportAll)
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index d21e2a384639..3cef0c180e0a 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -32,12 +32,10 @@
#include <vcl/FilterConfigItem.hxx>
-// - ImpSWFDialog -
-
-
class ResMgr;
namespace vcl { class Window; }
+
class ImpSWFDialog : public ModalDialog
{
private:
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 5d8f26914288..e15f3308b3c3 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -38,20 +38,16 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::document;
-
-// - PDFDialog functions -
-
-
#define SERVICE_NAME "com.sun.star.Impress.FlashExportDialog"
-
OUString SWFDialog_getImplementationName ()
throw (RuntimeException)
{
return OUString ( SERVICE_NAME );
}
+
Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
throw (RuntimeException)
{
@@ -60,34 +56,25 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
}
-
Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
return static_cast<cppu::OWeakObject*>(new SWFDialog( comphelper::getComponentContext(rSMgr) ));
}
-
-
#undef SERVICE_NAME
-
-// - SWFDialog -
-
-
SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) :
OGenericUnoDialog( rxContext )
{
}
-
SWFDialog::~SWFDialog()
{
}
-
Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
throw (RuntimeException, std::exception)
{
@@ -102,7 +89,6 @@ Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
}
-
void SAL_CALL SWFDialog::acquire()
throw ()
{
@@ -110,7 +96,6 @@ void SAL_CALL SWFDialog::acquire()
}
-
void SAL_CALL SWFDialog::release()
throw ()
{
@@ -118,7 +103,6 @@ void SAL_CALL SWFDialog::release()
}
-
Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
throw(RuntimeException, std::exception)
{
@@ -126,7 +110,6 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
}
-
OUString SAL_CALL SWFDialog::getImplementationName()
throw (RuntimeException, std::exception)
{
@@ -134,7 +117,6 @@ OUString SAL_CALL SWFDialog::getImplementationName()
}
-
Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
@@ -142,7 +124,6 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
}
-
VclPtr<Dialog> SWFDialog::createDialog( vcl::Window* pParent )
{
VclPtr<Dialog> pRet;
@@ -176,7 +157,6 @@ VclPtr<Dialog> SWFDialog::createDialog( vcl::Window* pParent )
}
-
void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
{
if( nExecutionResult && m_pDialog )
@@ -186,7 +166,6 @@ void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
}
-
Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
throw(RuntimeException, std::exception)
{
@@ -209,7 +188,6 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
}
-
Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
throw ( RuntimeException, std::exception )
{
@@ -231,7 +209,6 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
}
-
void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
{
@@ -248,7 +225,6 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
}
-
void SAL_CALL SWFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
throw(IllegalArgumentException, RuntimeException, std::exception)
{
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index 6d6cb84d01ca..50034d5a9369 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -26,12 +26,10 @@
#include <svtools/genericunodialog.hxx>
-// - SWFDialog -
-
-
namespace vcl { class Window; }
class ResMgr;
+
class SWFDialog : public ::svt::OGenericUnoDialog,
public ::comphelper::OPropertyArrayUsageHelper< SWFDialog >,
public css::beans::XPropertyAccess,
@@ -76,7 +74,6 @@ public:
};
-
-#endif // SWFDialog_HXX
+#endif // INCLUDED_FILTER_SOURCE_FLASH_SWFDIALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 51f47babab4f..3ba9ff0d8874 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -28,17 +28,15 @@
#include "giflzwc.hxx"
#include <memory>
-// - GIFWriter -
-
class GIFWriter
{
Bitmap aAccBmp;
SvStream& m_rGIF;
BitmapReadAccess* m_pAcc;
- sal_uLong nMinPercent;
- sal_uLong nMaxPercent;
- sal_uLong nLastPercent;
+ sal_uLong nMinPercent;
+ sal_uLong nMaxPercent;
+ sal_uLong nLastPercent;
long nActX;
long nActY;
sal_Int32 nInterlaced;
@@ -73,6 +71,7 @@ public:
bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
};
+
GIFWriter::GIFWriter(SvStream &rStream)
: m_rGIF(rStream)
, m_pAcc(nullptr)
@@ -88,7 +87,6 @@ GIFWriter::GIFWriter(SvStream &rStream)
}
-
bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
if ( pFilterConfigItem )
@@ -177,7 +175,6 @@ bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfi
}
-
void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
bool bExtended, long nTimer, Disposal eDisposal )
{
@@ -207,7 +204,6 @@ void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
}
-
void GIFWriter::WriteAnimation( const Animation& rAnimation )
{
const sal_uInt16 nCount = rAnimation.Count();
@@ -232,7 +228,6 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
}
-
void GIFWriter::MayCallback( sal_uLong nPercent )
{
if ( xStatusIndicator.is() )
@@ -247,7 +242,6 @@ void GIFWriter::MayCallback( sal_uLong nPercent )
}
-
bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
{
if( bStatus )
@@ -281,7 +275,6 @@ bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
}
-
void GIFWriter::DestroyAccess()
{
Bitmap::ReleaseAccess( m_pAcc );
@@ -289,7 +282,6 @@ void GIFWriter::DestroyAccess()
}
-
void GIFWriter::WriteSignature( bool bGIF89a )
{
if( bStatus )
@@ -302,7 +294,6 @@ void GIFWriter::WriteSignature( bool bGIF89a )
}
-
void GIFWriter::WriteGlobalHeader( const Size& rSize )
{
if( bStatus )
@@ -332,7 +323,6 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize )
}
-
void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
{
DBG_ASSERT( rAnimation.Count() > 0, "Animation has no bitmaps!" );
@@ -365,7 +355,6 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
}
-
void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
{
// writer PrefSize in 100th-mm as ApplicationExtension
@@ -384,7 +373,6 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
}
-
void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
{
if( bStatus )
@@ -416,7 +404,6 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
}
-
void GIFWriter::WriteLocalHeader()
{
if( bStatus )
@@ -448,7 +435,6 @@ void GIFWriter::WriteLocalHeader()
}
-
void GIFWriter::WritePalette()
{
if( bStatus && m_pAcc->HasPalette() )
@@ -475,7 +461,6 @@ void GIFWriter::WritePalette()
}
-
void GIFWriter::WriteAccess()
{
GIFLZWCompressor aCompressor;
@@ -548,7 +533,6 @@ void GIFWriter::WriteAccess()
}
-
void GIFWriter::WriteTerminator()
{
if( bStatus )
@@ -568,7 +552,4 @@ egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfi
return aWriter.WriteGIF(rGraphic, pConfigItem);
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx
index d74fa0db4bfc..7f5709a5ad62 100644
--- a/filter/source/graphicfilter/egif/giflzwc.cxx
+++ b/filter/source/graphicfilter/egif/giflzwc.cxx
@@ -22,9 +22,6 @@
#include "giflzwc.hxx"
-// - GIFImageDataOutputStream -
-
-
class GIFImageDataOutputStream
{
private:
@@ -47,7 +44,6 @@ public:
};
-
inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
{
while (nBitsBufSize>=8)
@@ -62,7 +58,6 @@ inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
}
-
inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
{
if( nBitsBufSize+nCodeLen>32 )
@@ -73,7 +68,6 @@ inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nC
}
-
GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 nLZWDataSize ) :
rStream(rGIF)
{
@@ -85,8 +79,6 @@ GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 n
}
-
-
GIFImageDataOutputStream::~GIFImageDataOutputStream()
{
WriteBits(0,7);
@@ -97,7 +89,6 @@ GIFImageDataOutputStream::~GIFImageDataOutputStream()
}
-
void GIFImageDataOutputStream::FlushBlockBuf()
{
if( nBlockBufSize )
@@ -109,22 +100,16 @@ void GIFImageDataOutputStream::FlushBlockBuf()
}
-// - GIFLZWCTreeNode -
-
-
struct GIFLZWCTreeNode
{
GIFLZWCTreeNode* pBrother; // next node which has the same father
GIFLZWCTreeNode* pFirstChild; // first
- sal_uInt16 nCode; // the code for the string of pixel values which comes about
- sal_uInt16 nValue; // the pixel value
+ sal_uInt16 nCode; // the code for the string of pixel values which comes about
+ sal_uInt16 nValue; // the pixel value
};
-// - GIFLZWCompressor -
-
-
GIFLZWCompressor::GIFLZWCompressor()
: pIDOS(nullptr), pTable(nullptr), pPrefix(nullptr), nDataSize(0), nClearCode(0),
nEOICode(0), nTableSize(0), nCodeSize(0)
@@ -132,14 +117,12 @@ GIFLZWCompressor::GIFLZWCompressor()
}
-
GIFLZWCompressor::~GIFLZWCompressor()
{
if (pIDOS!=nullptr) EndCompression();
}
-
void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize )
{
if( !pIDOS )
@@ -171,14 +154,13 @@ void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize )
}
-
void GIFLZWCompressor::Compress( sal_uInt8* pSrc, sal_uLong nSize )
{
if( pIDOS )
{
- GIFLZWCTreeNode* p;
- sal_uInt16 i;
- sal_uInt8 nV;
+ GIFLZWCTreeNode* p;
+ sal_uInt16 i;
+ sal_uInt8 nV;
if( !pPrefix && nSize )
{
@@ -231,7 +213,6 @@ void GIFLZWCompressor::Compress( sal_uInt8* pSrc, sal_uLong nSize )
}
-
void GIFLZWCompressor::EndCompression()
{
if( pIDOS )
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index bfe9784803d3..1d0f1e21d3bc 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -23,12 +23,10 @@
#include <vcl/bitmapaccess.hxx>
-// - GIFLZWCompressor -
-
-
class GIFImageDataOutputStream;
struct GIFLZWCTreeNode;
+
class GIFLZWCompressor
{
private:
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 4bf1b2d1ae01..4214f0d7a8aa 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -43,9 +43,6 @@
#define ColorMap 320
-// - TIFFWriter -
-
-
struct TIFFLZWCTreeNode
{
@@ -55,6 +52,7 @@ struct TIFFLZWCTreeNode
sal_uInt16 nValue; // pixel value
};
+
class TIFFWriter
{
private:
@@ -62,7 +60,7 @@ private:
SvStream& m_rOStm;
sal_uInt32 mnStreamOfs;
- bool mbStatus;
+ bool mbStatus;
BitmapReadAccess* mpAcc;
sal_uInt32 mnWidth, mnHeight, mnColors;
@@ -107,14 +105,13 @@ private:
public:
- explicit TIFFWriter(SvStream &rStream);
- ~TIFFWriter();
+ explicit TIFFWriter(SvStream &rStream);
+ ~TIFFWriter();
bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
-
TIFFWriter::TIFFWriter(SvStream &rStream)
: m_rOStm(rStream)
, mnStreamOfs(0)
@@ -147,10 +144,12 @@ TIFFWriter::TIFFWriter(SvStream &rStream)
{
}
+
TIFFWriter::~TIFFWriter()
{
}
+
bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
if ( pFilterConfigItem )
@@ -239,7 +238,6 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo
}
-
void TIFFWriter::ImplCallback( sal_uInt32 nPercent )
{
if ( xStatusIndicator.is() )
@@ -254,8 +252,6 @@ void TIFFWriter::ImplCallback( sal_uInt32 nPercent )
}
-
-
bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
{
mnTagCount = 0;
@@ -302,7 +298,7 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
mnBitmapPos = m_rOStm.Tell();
ImplWriteTag( StripOffsets, 4, 1, 0 );
ImplWriteTag( SamplesPerPixel, 3, 1, ( mnBitsPerPixel == 24 ) ? 3 : 1 );
- ImplWriteTag( RowsPerStrip, 4, 1, mnHeight ); //0xffffffff );
+ ImplWriteTag( RowsPerStrip, 4, 1, mnHeight );
mnStripByteCountPos = m_rOStm.Tell();
ImplWriteTag( StripByteCounts, 4, 1, ( ( mnWidth * mnBitsPerPixel * mnHeight ) + 7 ) >> 3 );
mnXResPos = m_rOStm.Tell();
@@ -330,7 +326,6 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
}
-
void TIFFWriter::ImplWritePalette()
{
sal_uInt16 i;
@@ -357,7 +352,6 @@ void TIFFWriter::ImplWritePalette()
}
-
void TIFFWriter::ImplWriteBody()
{
sal_uInt8 nTemp = 0;
@@ -365,8 +359,8 @@ void TIFFWriter::ImplWriteBody()
sal_uLong j, x, y;
sal_uLong nGfxBegin = m_rOStm.Tell();
- m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset
- m_rOStm.WriteUInt32( nGfxBegin - mnStreamOfs ); // to the bitmap data
+ m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset
+ m_rOStm.WriteUInt32( nGfxBegin - mnStreamOfs ); // to the bitmap data
m_rOStm.Seek( nGfxBegin );
StartCompression();
@@ -464,7 +458,6 @@ void TIFFWriter::ImplWriteBody()
}
-
void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit )
{
sal_uLong nCurrentPos = m_rOStm.Tell();
@@ -476,7 +469,6 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti
}
-
void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt32 nNumberOfItems, sal_uInt32 nValue)
{
mnTagCount++;
@@ -490,7 +482,6 @@ void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt
}
-
inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
{
dwShift |= ( nCode << ( nOffset - nCodeLen ) );
@@ -508,7 +499,6 @@ inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
}
-
void TIFFWriter::StartCompression()
{
sal_uInt16 i;
@@ -535,7 +525,6 @@ void TIFFWriter::StartCompression()
}
-
void TIFFWriter::Compress( sal_uInt8 nCompThis )
{
TIFFLZWCTreeNode* p;
@@ -589,7 +578,6 @@ void TIFFWriter::Compress( sal_uInt8 nCompThis )
}
-
void TIFFWriter::EndCompression()
{
if( pPrefix )
@@ -600,7 +588,6 @@ void TIFFWriter::EndCompression()
}
-
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 1fe1474e9ca7..fda658b6d978 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -49,17 +49,14 @@ PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMg
}
-// - ImpPDFDialog -
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-// tabbed PDF dialog implementation
-// please note: the default used here are the same as per specification,
-// they should be the same in PDFFilter::implExport and in PDFExport::PDFExport
-
+/** Tabbed PDF dialog implementation
+ Please note: the default used here are the same as per specification,
+ They should be the same in PDFFilter::implExport and in PDFExport::PDFExport
+ */
ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >& rFilterData,
const Reference< XComponent >& rxDoc)
: SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui"),
@@ -125,9 +122,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbExportBmkToPDFDestination( false ),
mbSignPDF( false )
-
{
-// check for selection
+ // check for selection
try
{
Reference< frame::XController > xController( Reference< frame::XModel >( rxDoc, UNO_QUERY )->getCurrentController() );
@@ -164,7 +160,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
}
}
-// check if source document is a presentation
+ // check if source document is a presentation
try
{
Reference< XServiceInfo > xInfo( rxDoc, UNO_QUERY );
@@ -180,7 +176,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
{
}
-//get the CTL (Complex Text Layout) from general options, returns sal_True if we have a CTL font on our hands.
+ // get the CTL (Complex Text Layout) from general options, returns sal_True if we have a CTL font on our hands.
mbUseCTLFont = maConfigI18N.ReadBool( "CTLFont", false );
mbUseLosslessCompression = maConfigItem.ReadBool( "UseLosslessCompression", false );
@@ -209,7 +205,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mnFormsType = 0;
mbAllowDuplicateFieldNames = maConfigItem.ReadBool( "AllowDuplicateFieldNames", false );
-//prepare values for the Viewer tab page
+ // prepare values for the Viewer tab page
mbHideViewerToolbar = maConfigItem.ReadBool( "HideViewerToolbar", false );
mbHideViewerMenubar = maConfigItem.ReadBool( "HideViewerMenubar", false );
mbHideViewerWindowControls = maConfigItem.ReadBool( "HideViewerWindowControls", false );
@@ -227,13 +223,13 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
if( mnInitialPage < 1 )
mnInitialPage = 1;
-//prepare values for the security tab page
+ // prepare values for the security tab page
mnPrint = maConfigItem.ReadInt32( "Printing", 2 );
mnChangesAllowed = maConfigItem.ReadInt32( "Changes", 4 );
mbCanCopyOrExtract = maConfigItem.ReadBool( "EnableCopyingOfContent", true );
mbCanExtractForAccessibility = maConfigItem.ReadBool( "EnableTextAccessForAccessibilityTools", true );
-//prepare values for relative links
+ // prepare values for relative links
mbExportRelativeFsysLinks = maConfigItem.ReadBool( "ExportLinksRelativeFsys", false );
mnViewPDFMode = maConfigItem.ReadInt32( "PDFViewSelection", 0 );
@@ -241,24 +237,24 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbConvertOOoTargets = maConfigItem.ReadBool( "ConvertOOoTargetToPDFTarget", false );
mbExportBmkToPDFDestination = maConfigItem.ReadBool( "ExportBookmarksToPDFDestination", false );
-//prepare values for digital signatures
+ // prepare values for digital signatures
mbSignPDF = maConfigItem.ReadBool( "SignPDF", false );
-//queue the tab pages for later creation (created when first shown)
+ // queue the tab pages for later creation (created when first shown)
mnSigningPageId = AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr);
mnSecurityPageId = AddTabPage("security", ImpPDFTabSecurityPage::Create, nullptr);
mnLinksPage = AddTabPage("links", ImpPDFTabLinksPage::Create, nullptr);
mnInterfacePageId = AddTabPage("userinterface", ImpPDFTabViewerPage::Create, nullptr);
mnViewPageId = AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, nullptr);
- //last queued is the first to be displayed (or so it seems..)
+ // last queued is the first to be displayed (or so it seems..)
mnGeneralPageId = AddTabPage("general", ImpPDFTabGeneralPage::Create, nullptr );
- //get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button
+ // get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button
OUString sOkButtonText = maConfigItem.ReadString( "_OkButtonString", OUString() );
- //change text on the Ok button: get the relevant string from resources, update it on the button
- //according to the exported pdf file destination: send as e-mail or write to file?
+ // change text on the Ok button: get the relevant string from resources, update it on the button
+ // according to the exported pdf file destination: send as e-mail or write to file?
if (!sOkButtonText.isEmpty())
{
GetOKButton().SetText(sOkButtonText);
@@ -266,11 +262,12 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
GetCancelButton().SetClickHdl(LINK(this, ImpPDFTabDialog, CancelHdl));
-//remove the reset button, not needed in this tabbed dialog
+ // remove the reset button, not needed in this tabbed dialog
RemoveResetButton();
}
+
ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const
{
SfxTabPage* pSecurityPage = GetTabPage(mnSecurityPageId);
@@ -281,6 +278,7 @@ ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const
return nullptr;
}
+
ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const
{
SfxTabPage* pLinksPage = GetTabPage(mnLinksPage);
@@ -291,6 +289,7 @@ ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const
return nullptr;
}
+
ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
{
SfxTabPage* pGeneralPage = GetTabPage(mnGeneralPageId);
@@ -301,6 +300,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
return nullptr;
}
+
IMPL_LINK_NOARG_TYPED(ImpPDFTabDialog, CancelHdl, Button*, void)
{
EndDialog();
@@ -312,10 +312,11 @@ ImpPDFTabDialog::~ImpPDFTabDialog()
disposeOnce();
}
+
void ImpPDFTabDialog::dispose()
{
-//delete the pages, needed because otherwise the child tab pages
-//don't get destroyed
+ // delete the pages, needed because otherwise the child tab pages
+ // don't get destroyed
RemoveTabPage(mnGeneralPageId);
RemoveTabPage(mnInterfacePageId);
RemoveTabPage(mnViewPageId);
@@ -360,15 +361,15 @@ void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId,
short ImpPDFTabDialog::Ok( )
{
-//here the whole mechanism of the base class is not used
-//when Ok is hit, the user means 'convert to PDF', so simply close with ok
+ // here the whole mechanism of the base class is not used
+ // when Ok is hit, the user means 'convert to PDF', so simply close with ok
return RET_OK;
}
Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
{
-// updating the FilterData sequence and storing FilterData to configuration
+ // updating the FilterData sequence and storing FilterData to configuration
if( GetTabPage(mnGeneralPageId) )
static_cast<ImpPDFTabGeneralPage*>( GetTabPage(mnGeneralPageId) )->GetFilterConfigItem( this );
if( GetTabPage(mnInterfacePageId) )
@@ -382,7 +383,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
if( GetTabPage(mnSigningPageId) )
static_cast<ImpPDFTabSigningPage*>( GetTabPage(mnSigningPageId) )->GetFilterConfigItem( this );
-//prepare the items to be returned
+ // prepare the items to be returned
maConfigItem.WriteBool( "UseLosslessCompression", mbUseLosslessCompression );
maConfigItem.WriteInt32("Quality", mnQuality );
maConfigItem.WriteBool( "ReduceImageResolution", mbReduceImageResolution );
@@ -440,7 +441,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
Sequence< PropertyValue > aRet( maConfigItem.GetFilterData() );
- // OMG, this is horrible coding style...
+ // FIXME: OMG, this is horrible coding style...
int nElementAdded = 12;
aRet.realloc( aRet.getLength() + nElementAdded );
@@ -554,6 +555,7 @@ ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
disposeOnce();
}
+
void ImpPDFTabGeneralPage::dispose()
{
mpRbAll.clear();
@@ -586,11 +588,12 @@ void ImpPDFTabGeneralPage::dispose()
SfxTabPage::dispose();
}
+
void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
{
mpaParent = paParent;
-//init this class data
+ // init this class data
mpRbRange->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, TogglePagesHdl ) );
mpRbAll->Check();
@@ -634,12 +637,13 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mpCbExportFormFields->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl ) );
-// get the form values, for use with PDF/A-1 selection interface
+ // get the form values, for use with PDF/A-1 selection interface
mbTaggedPDFUserSelection = paParent->mbUseTaggedPDF;
mbExportFormFieldsUserSelection = paParent->mbExportFormFields;
if( !mpCbPDFA1b->IsChecked() )
- {// the value for PDF/A set by the ToggleExportPDFAHdl method called before
+ {
+ // the value for PDF/A set by the ToggleExportPDFAHdl method called before
mpCbTaggedPDF->Check( mbTaggedPDFUserSelection );
mpCbExportFormFields->Check( mbExportFormFieldsUserSelection );
}
@@ -675,14 +679,13 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mpCbAddStream->Check(paParent->mbAddStream);
mpCbAddStream->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleAddStreamHdl ) );
- // init addstream dependencies
- ToggleAddStreamHdl(*mpCbAddStream);
+ ToggleAddStreamHdl(*mpCbAddStream); // init addstream dependencies
}
void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
{
-// updating the FilterData sequence and storing FilterData to configuration
+ // updating the FilterData sequence and storing FilterData to configuration
paParent->mbUseLosslessCompression = mpRbLosslessCompression->IsChecked();
paParent->mnQuality = static_cast<sal_Int32>(mpNfQuality->GetValue());
paParent->mbReduceImageResolution = mpCbReduceImageResolution->IsChecked();
@@ -804,19 +807,19 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void)
IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void)
{
- //set the security page status (and its controls as well)
+ // set the security page status (and its controls as well)
ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : nullptr;
if (pSecPage)
{
pSecPage->ImplPDFASecurityControl(!mpCbPDFA1b->IsChecked());
}
-//PDF/A-1 needs tagged PDF, so force disable the control, will be forced in pdfexport.
+ // PDF/A-1 needs tagged PDF, so force disable the control, will be forced in pdfexport.
bool bPDFA1Sel = mpCbPDFA1b->IsChecked();
mpFormsFrame->Enable(bPDFA1Sel);
if(bPDFA1Sel)
{
-//store the values of subordinate controls
+ // store the values of subordinate controls
mbTaggedPDFUserSelection = mpCbTaggedPDF->IsChecked();
mpCbTaggedPDF->Check();
mpCbTaggedPDF->Enable(false);
@@ -826,12 +829,13 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void
}
else
{
-//retrieve the values of subordinate controls
+ // retrieve the values of subordinate controls
mpCbTaggedPDF->Enable();
mpCbTaggedPDF->Check( mbTaggedPDFUserSelection );
mpCbExportFormFields->Check( mbExportFormFieldsUserSelection );
mpCbExportFormFields->Enable();
}
+
// PDF/A-1 doesn't allow launch action, so enable/disable the selection on
// Link page
ImpPDFTabLinksPage* pLinksPage = mpaParent ? mpaParent->getLinksPage() : nullptr;
@@ -846,7 +850,8 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void
}
}
-// the option features tab page
+
+/// The option features tab page
ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", &rCoreSet)
, mbUseCTLFont(false)
@@ -880,6 +885,7 @@ ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage()
disposeOnce();
}
+
void ImpPDFTabOpnFtrPage::dispose()
{
mpRbOpnPageOnly.clear();
@@ -900,6 +906,7 @@ void ImpPDFTabOpnFtrPage::dispose()
SfxTabPage::dispose();
}
+
VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
@@ -1014,28 +1021,30 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
}
}
+
IMPL_LINK_NOARG_TYPED(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void)
{
ToggleRbPgLyContinueFacingHdl();
}
+
void ImpPDFTabOpnFtrPage::ToggleRbPgLyContinueFacingHdl()
{
mpCbPgLyFirstOnLeft->Enable( mpRbPgLyContinueFacing->IsChecked() );
}
+
IMPL_LINK_NOARG_TYPED( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void )
{
mpNumZoom->Enable( mpRbMagnZoom->IsChecked() );
}
-// The Viewer preferences tab page
-
+/// The Viewer preferences tab page
ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent,
const SfxItemSet& rCoreSet )
- : SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet)
- , mbIsPresentation(false)
+: SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet)
+ , mbIsPresentation(false)
{
get(m_pCbResWinInit,"resize");
get(m_pCbCenterWindow,"center");
@@ -1053,11 +1062,13 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent,
m_pRbVisibleBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) );
}
+
ImpPDFTabViewerPage::~ImpPDFTabViewerPage()
{
disposeOnce();
}
+
void ImpPDFTabViewerPage::dispose()
{
m_pCbResWinInit.clear();
@@ -1074,11 +1085,13 @@ void ImpPDFTabViewerPage::dispose()
SfxTabPage::dispose();
}
+
IMPL_LINK_NOARG_TYPED( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void )
{
m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() );
}
+
VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
@@ -1127,7 +1140,8 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
}
}
-// The Security preferences tab page
+
+/// The Security preferences tab page
ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(vcl::Window* i_pParent, const SfxItemSet& i_rCoreSet)
: SfxTabPage(i_pParent, "PdfSecurityPage","filter/ui/pdfsecuritypage.ui", &i_rCoreSet)
, msUserPwdTitle( PDFFilterResId( STR_PDF_EXPORT_UDPWD ) )
@@ -1171,6 +1185,7 @@ ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage()
disposeOnce();
}
+
void ImpPDFTabSecurityPage::dispose()
{
mpPbSetPwd.clear();
@@ -1196,6 +1211,7 @@ void ImpPDFTabSecurityPage::dispose()
SfxTabPage::dispose();
}
+
VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
@@ -1205,22 +1221,22 @@ VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( vcl::Window* pParent,
void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
{
-// please note that in PDF/A-1a mode even if this are copied back,
-// the security settings are forced disabled in PDFExport::Export
+ // please note that in PDF/A-1a mode even if this are copied back,
+ // the security settings are forced disabled in PDFExport::Export
paParent->mbEncrypt = mbHaveUserPassword;
paParent->mxPreparedPasswords = mxPreparedPasswords;
paParent->mbRestrictPermissions = mbHaveOwnerPassword;
paParent->maPreparedOwnerPassword = maPreparedOwnerPassword;
-//verify print status
+ // verify print status
paParent->mnPrint = 0;
if( mpRbPrintLowRes->IsChecked() )
paParent->mnPrint = 1;
else if( mpRbPrintHighRes->IsChecked() )
paParent->mnPrint = 2;
-//verify changes permitted
+ // verify changes permitted
paParent->mnChangesAllowed = 0;
if( mpRbChangesInsDel->IsChecked() )
@@ -1237,7 +1253,6 @@ void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
}
-
void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
{
switch( paParent->mnPrint )
@@ -1277,7 +1292,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
mpCbEnableCopy->Check( paParent->mbCanCopyOrExtract );
mpCbEnableAccessibility->Check( paParent->mbCanExtractForAccessibility );
-// set the status of this windows, according to the PDFA selection
+ // set the status of this windows, according to the PDFA selection
enablePermissionControls();
ImpPDFTabGeneralPage* pGeneralPage = paParent->getGeneralPage();
@@ -1286,6 +1301,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected());
}
+
IMPL_LINK_NOARG_TYPED(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void)
{
ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle );
@@ -1295,7 +1311,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void)
aPwdDialog->SetText(msStrSetPwd);
aPwdDialog->SetGroup2Text(msOwnerPwdTitle);
aPwdDialog->AllowAsciiOnly();
- if( aPwdDialog->Execute() == RET_OK ) //OK issued get password and set it
+ if( aPwdDialog->Execute() == RET_OK ) // OK issued get password and set it
{
OUString aUserPW( aPwdDialog->GetPassword() );
OUString aOwnerPW( aPwdDialog->GetPassword2() );
@@ -1376,14 +1392,13 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
// This tab page is under control of the PDF/A-1a checkbox:
-// implement a method to do it.
-
+// TODO: implement a method to do it.
void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
{
if( bEnableSecurity )
{
Enable();
-//after enable, check the status of control as if the dialog was initialized
+ // after enable, check the status of control as if the dialog was initialized
}
else
Enable( false );
@@ -1392,8 +1407,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
}
-// The link preferences tab page (relative and other stuff)
-
+/// The link preferences tab page (relative and other stuff)
ImpPDFTabLinksPage::ImpPDFTabLinksPage( vcl::Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",&rCoreSet ),
@@ -1416,6 +1430,7 @@ ImpPDFTabLinksPage::~ImpPDFTabLinksPage()
disposeOnce();
}
+
void ImpPDFTabLinksPage::dispose()
{
m_pCbExprtBmkrToNmDst.clear();
@@ -1427,6 +1442,7 @@ void ImpPDFTabLinksPage::dispose()
SfxTabPage::dispose();
}
+
VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
@@ -1488,6 +1504,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
mbOpnLnksBrowserUserState = true;
break;
}
+
// now check the status of PDF/A selection
// and set the link action accordingly
// PDF/A-1 doesn't allow launch action on links
@@ -1498,22 +1515,23 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
}
-// called from general tab, with PDFA/1 selection status
-// retrieves/store the status of Launch action selection
+/** Called from general tab, with PDFA/1 selection status.
+ Retrieves/store the status of Launch action selection.
+ */
void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch )
{
-// set the value and position of link type selection
+ // set the value and position of link type selection
if( bEnableLaunch )
{
m_pRbOpnLnksLaunch->Enable();
-//restore user state with no PDF/A-1 selected
+ // restore user state with no PDF/A-1 selected
m_pRbOpnLnksDefault->Check( mbOpnLnksDefaultUserState );
m_pRbOpnLnksLaunch->Check( mbOpnLnksLaunchUserState );
m_pRbOpnLnksBrowser->Check( mbOpnLnksBrowserUserState );
}
else
{
-//save user state with no PDF/A-1 selected
+ // save user state with no PDF/A-1 selected
mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked();
mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked();
mbOpnLnksBrowserUserState = m_pRbOpnLnksBrowser->IsChecked();
@@ -1524,8 +1542,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch )
}
-// reset the memory of Launch action present
-// when PDF/A-1 was requested
+/// Reset the memory of Launch action present when PDF/A-1 was requested
IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void)
{
mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked();
@@ -1534,8 +1551,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, voi
}
-// reset the memory of a launch action present
-// when PDF/A-1 was requested
+/// Reset the memory of a launch action present when PDF/A-1 was requested
IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void)
{
mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked();
@@ -1543,6 +1559,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, voi
mbOpnLnksBrowserUserState = m_pRbOpnLnksBrowser->IsChecked();
}
+
ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rErrors)
: MessageDialog(nullptr, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui")
{
@@ -1614,11 +1631,13 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE
m_pErrors->SetSelectHdl( LINK( this, ImplErrorDialog, SelectHdl ) );
}
+
ImplErrorDialog::~ImplErrorDialog()
{
disposeOnce();
}
+
void ImplErrorDialog::dispose()
{
// free strings again
@@ -1629,6 +1648,7 @@ void ImplErrorDialog::dispose()
MessageDialog::dispose();
}
+
IMPL_LINK_NOARG_TYPED(ImplErrorDialog, SelectHdl, ListBox&, void)
{
OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectEntryData());
@@ -1636,8 +1656,7 @@ IMPL_LINK_NOARG_TYPED(ImplErrorDialog, SelectHdl, ListBox&, void)
}
-// The digital signatures tab page
-
+/// The digital signatures tab page
ImpPDFTabSigningPage::ImpPDFTabSigningPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", &rCoreSet)
, maSignCertificate()
@@ -1662,6 +1681,7 @@ ImpPDFTabSigningPage::~ImpPDFTabSigningPage()
disposeOnce();
}
+
void ImpPDFTabSigningPage::dispose()
{
mpEdSignCert.clear();
@@ -1674,6 +1694,7 @@ void ImpPDFTabSigningPage::dispose()
SfxTabPage::dispose();
}
+
IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void )
{
@@ -1712,6 +1733,7 @@ IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, v
}
}
+
IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void )
{
mpEdSignCert->SetText("");
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index cd2587b3aa10..103bc061a100 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -20,27 +20,23 @@
#ifndef INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
#define INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
-#include "pdffilter.hxx"
-
-#include "vcl/dialog.hxx"
-#include "vcl/button.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/field.hxx"
-#include "vcl/edit.hxx"
-#include "vcl/layout.hxx"
-#include "vcl/lstbox.hxx"
-#include "vcl/combobox.hxx"
-#include "vcl/group.hxx"
-#include "vcl/pdfwriter.hxx"
-
+#include <sfx2/tabdlg.hxx>
+
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/group.hxx>
+#include <vcl/pdfwriter.hxx>
#include <vcl/FilterConfigItem.hxx>
-#include "sfx2/tabdlg.hxx"
-
-#include "com/sun/star/beans/NamedValue.hpp"
-
+#include "pdffilter.hxx"
-// - ImpPDFDialog -
+#include <com/sun/star/beans/NamedValue.hpp>
class ImpPDFTabGeneralPage;
@@ -48,29 +44,35 @@ class ImpPDFTabViewerPage;
class ImpPDFTabOpnFtrPage;
class ImpPDFTabLinksPage;
+
class PDFFilterResId : public ResId
{
public:
- explicit PDFFilterResId( sal_uInt32 nId );
+ explicit PDFFilterResId( sal_uInt32 nId );
};
+
class ImplErrorDialog : public MessageDialog
{
- VclPtr<ListBox> m_pErrors;
- VclPtr<FixedText> m_pExplanation;
+private:
+ VclPtr<ListBox> m_pErrors;
+ VclPtr<FixedText> m_pExplanation;
DECL_LINK_TYPED(SelectHdl, ListBox&, void);
- public:
- explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& );
- virtual ~ImplErrorDialog();
- virtual void dispose() override;
+
+public:
+ explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& );
+ virtual ~ImplErrorDialog();
+
+ virtual void dispose() override;
};
+
class ImpPDFTabSecurityPage;
class ImpPDFTabLinksPage;
-//class tabbed dialog
+/// Class tabbed dialog
class ImpPDFTabDialog : public SfxTabDialog
{
private:
@@ -81,81 +83,81 @@ private:
DECL_LINK_TYPED(CancelHdl, Button*, void);
- sal_uInt16 mnSigningPageId;
- sal_uInt16 mnSecurityPageId;
- sal_uInt16 mnLinksPage;
- sal_uInt16 mnInterfacePageId;
- sal_uInt16 mnViewPageId;
- sal_uInt16 mnGeneralPageId;
+ sal_uInt16 mnSigningPageId;
+ sal_uInt16 mnSecurityPageId;
+ sal_uInt16 mnLinksPage;
+ sal_uInt16 mnInterfacePageId;
+ sal_uInt16 mnViewPageId;
+ sal_uInt16 mnGeneralPageId;
protected:
-//the following data are the configuration used throughout the dialog and pages
- bool mbIsPresentation;
- bool mbIsWriter;
- bool mbSelectionPresent;
- bool mbUseCTLFont;
- bool mbUseLosslessCompression;
- sal_Int32 mnQuality;
- bool mbReduceImageResolution;
- sal_Int32 mnMaxImageResolution;
- bool mbUseTaggedPDF;
- sal_Int32 mnPDFTypeSelection;
- bool mbExportNotes;
- bool mbViewPDF;
- bool mbExportNotesPages;
- bool mbUseTransitionEffects;
- bool mbIsSkipEmptyPages;
- bool mbAddStream;
- sal_Int32 mnFormsType;
- bool mbExportFormFields;
- bool mbAllowDuplicateFieldNames;
- bool mbExportBookmarks;
- bool mbExportHiddenSlides;
- sal_Int32 mnOpenBookmarkLevels;
-
- bool mbHideViewerToolbar;
- bool mbHideViewerMenubar;
- bool mbHideViewerWindowControls;
- bool mbResizeWinToInit;
- bool mbCenterWindow;
- bool mbOpenInFullScreenMode;
- bool mbDisplayPDFDocumentTitle;
- sal_Int32 mnMagnification;
- sal_Int32 mnInitialView;
- sal_Int32 mnZoom;
- sal_Int32 mnInitialPage;
-
- sal_Int32 mnPageLayout;
- bool mbFirstPageLeft;
-
- bool mbEncrypt;
-
- bool mbRestrictPermissions;
+ // the following data are the configuration used throughout the dialog and pages
+ bool mbIsPresentation;
+ bool mbIsWriter;
+ bool mbSelectionPresent;
+ bool mbUseCTLFont;
+ bool mbUseLosslessCompression;
+ sal_Int32 mnQuality;
+ bool mbReduceImageResolution;
+ sal_Int32 mnMaxImageResolution;
+ bool mbUseTaggedPDF;
+ sal_Int32 mnPDFTypeSelection;
+ bool mbExportNotes;
+ bool mbViewPDF;
+ bool mbExportNotesPages;
+ bool mbUseTransitionEffects;
+ bool mbIsSkipEmptyPages;
+ bool mbAddStream;
+ sal_Int32 mnFormsType;
+ bool mbExportFormFields;
+ bool mbAllowDuplicateFieldNames;
+ bool mbExportBookmarks;
+ bool mbExportHiddenSlides;
+ sal_Int32 mnOpenBookmarkLevels;
+
+ bool mbHideViewerToolbar;
+ bool mbHideViewerMenubar;
+ bool mbHideViewerWindowControls;
+ bool mbResizeWinToInit;
+ bool mbCenterWindow;
+ bool mbOpenInFullScreenMode;
+ bool mbDisplayPDFDocumentTitle;
+ sal_Int32 mnMagnification;
+ sal_Int32 mnInitialView;
+ sal_Int32 mnZoom;
+ sal_Int32 mnInitialPage;
+
+ sal_Int32 mnPageLayout;
+ bool mbFirstPageLeft;
+
+ bool mbEncrypt;
+
+ bool mbRestrictPermissions;
css::uno::Sequence< css::beans::NamedValue > maPreparedOwnerPassword;
- sal_Int32 mnPrint;
- sal_Int32 mnChangesAllowed;
- bool mbCanCopyOrExtract;
- bool mbCanExtractForAccessibility;
+ sal_Int32 mnPrint;
+ sal_Int32 mnChangesAllowed;
+ bool mbCanCopyOrExtract;
+ bool mbCanExtractForAccessibility;
css::uno::Reference< css::beans::XMaterialHolder > mxPreparedPasswords;
- bool mbIsRangeChecked;
- OUString msPageRange;
- bool mbSelectionIsChecked;
+ bool mbIsRangeChecked;
+ OUString msPageRange;
+ bool mbSelectionIsChecked;
- bool mbExportRelativeFsysLinks;
- sal_Int32 mnViewPDFMode;
- bool mbConvertOOoTargets;
- bool mbExportBmkToPDFDestination;
+ bool mbExportRelativeFsysLinks;
+ sal_Int32 mnViewPDFMode;
+ bool mbConvertOOoTargets;
+ bool mbExportBmkToPDFDestination;
- bool mbSignPDF;
- OUString msSignPassword;
- OUString msSignLocation;
- OUString msSignContact;
- OUString msSignReason;
+ bool mbSignPDF;
+ OUString msSignPassword;
+ OUString msSignLocation;
+ OUString msSignContact;
+ OUString msSignReason;
css::uno::Reference< css::security::XCertificate > maSignCertificate;
- OUString msSignTSA;
+ OUString msSignTSA;
- OUString maWatermarkText;
+ OUString maWatermarkText;
public:
@@ -166,69 +168,69 @@ public:
friend class ImpPDFTabLinksPage;
friend class ImpPDFTabSigningPage;
- ImpPDFTabDialog( vcl::Window* pParent,
- Sequence< PropertyValue >& rFilterData,
- const css::uno::Reference< XComponent >& rDoc
- );
- virtual ~ImpPDFTabDialog();
- virtual void dispose() override;
+ ImpPDFTabDialog( vcl::Window* pParent,
+ Sequence< PropertyValue >& rFilterData,
+ const css::uno::Reference< XComponent >& rDoc);
+ virtual ~ImpPDFTabDialog();
+
+ virtual void dispose() override;
Sequence< PropertyValue > GetFilterData();
- ImpPDFTabSecurityPage* getSecurityPage() const;
- ImpPDFTabLinksPage* getLinksPage() const;
- ImpPDFTabGeneralPage* getGeneralPage() const;
+ ImpPDFTabSecurityPage* getSecurityPage() const;
+ ImpPDFTabLinksPage* getLinksPage() const;
+ ImpPDFTabGeneralPage* getGeneralPage() const;
protected:
- virtual void PageCreated( sal_uInt16 _nId,
- SfxTabPage& _rPage ) override;
+ virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) override;
virtual short Ok() override;
};
-//class tab page general
+
+/// Class tab page general
class ImpPDFTabGeneralPage : public SfxTabPage
{
- friend class ImpPDFTabLinksPage;
+ friend class ImpPDFTabLinksPage;
- VclPtr<RadioButton> mpRbAll;
- VclPtr<RadioButton> mpRbRange;
- VclPtr<RadioButton> mpRbSelection;
- VclPtr<Edit> mpEdPages;
+ VclPtr<RadioButton> mpRbAll;
+ VclPtr<RadioButton> mpRbRange;
+ VclPtr<RadioButton> mpRbSelection;
+ VclPtr<Edit> mpEdPages;
- VclPtr<RadioButton> mpRbLosslessCompression;
- VclPtr<RadioButton> mpRbJPEGCompression;
- VclPtr<VclContainer> mpQualityFrame;
- VclPtr<MetricField> mpNfQuality;
- VclPtr<CheckBox> mpCbReduceImageResolution;
- VclPtr<ComboBox> mpCoReduceImageResolution;
+ VclPtr<RadioButton> mpRbLosslessCompression;
+ VclPtr<RadioButton> mpRbJPEGCompression;
+ VclPtr<VclContainer> mpQualityFrame;
+ VclPtr<MetricField> mpNfQuality;
+ VclPtr<CheckBox> mpCbReduceImageResolution;
+ VclPtr<ComboBox> mpCoReduceImageResolution;
- VclPtr<CheckBox> mpCbPDFA1b;
- VclPtr<CheckBox> mpCbTaggedPDF;
- bool mbTaggedPDFUserSelection;
+ VclPtr<CheckBox> mpCbPDFA1b;
+ VclPtr<CheckBox> mpCbTaggedPDF;
+ bool mbTaggedPDFUserSelection;
- VclPtr<CheckBox> mpCbExportFormFields;
- bool mbExportFormFieldsUserSelection;
- VclPtr<VclContainer> mpFormsFrame;
- VclPtr<ListBox> mpLbFormsFormat;
- VclPtr<CheckBox> mpCbAllowDuplicateFieldNames;
+ VclPtr<CheckBox> mpCbExportFormFields;
+ bool mbExportFormFieldsUserSelection;
+ VclPtr<VclContainer> mpFormsFrame;
+ VclPtr<ListBox> mpLbFormsFormat;
+ VclPtr<CheckBox> mpCbAllowDuplicateFieldNames;
- VclPtr<CheckBox> mpCbExportBookmarks;
- VclPtr<CheckBox> mpCbExportHiddenSlides;
- VclPtr<CheckBox> mpCbExportNotes;
- VclPtr<CheckBox> mpCbViewPDF;
- VclPtr<CheckBox> mpCbExportNotesPages;
+ VclPtr<CheckBox> mpCbExportBookmarks;
+ VclPtr<CheckBox> mpCbExportHiddenSlides;
+ VclPtr<CheckBox> mpCbExportNotes;
+ VclPtr<CheckBox> mpCbViewPDF;
+ VclPtr<CheckBox> mpCbExportNotesPages;
- VclPtr<CheckBox> mpCbExportEmptyPages;
- VclPtr<CheckBox> mpCbAddStream;
+ VclPtr<CheckBox> mpCbExportEmptyPages;
+ VclPtr<CheckBox> mpCbAddStream;
- VclPtr<CheckBox> mpCbWatermark;
- VclPtr<FixedText> mpFtWatermark;
- VclPtr<Edit> mpEdWatermark;
+ VclPtr<CheckBox> mpCbWatermark;
+ VclPtr<FixedText> mpFtWatermark;
+ VclPtr<Edit> mpEdWatermark;
- bool mbIsPresentation;
- bool mbIsWriter;
+ bool mbIsPresentation;
+ bool mbIsWriter;
- VclPtr<ImpPDFTabDialog> mpaParent;
+ VclPtr<ImpPDFTabDialog> mpaParent;
DECL_LINK_TYPED( TogglePagesHdl, RadioButton&, void );
DECL_LINK_TYPED( ToggleCompressionHdl, RadioButton&, void );
@@ -236,127 +238,124 @@ class ImpPDFTabGeneralPage : public SfxTabPage
DECL_LINK_TYPED( ToggleWatermarkHdl, CheckBox&, void );
DECL_LINK_TYPED( ToggleAddStreamHdl, CheckBox&, void );
DECL_LINK_TYPED( ToggleExportFormFieldsHdl, CheckBox&, void );
- void TogglePagesHdl();
+
+ void TogglePagesHdl();
public:
DECL_LINK_TYPED( ToggleExportPDFAHdl, CheckBox&, void );
- ImpPDFTabGeneralPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
- virtual ~ImpPDFTabGeneralPage();
- virtual void dispose() override;
+ ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabGeneralPage();
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet);
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
- void GetFilterConfigItem(ImpPDFTabDialog* paParent);
- void SetFilterConfigItem(ImpPDFTabDialog* paParent);
- bool IsPdfaSelected() const { return mpCbPDFA1b->IsChecked(); }
+ void GetFilterConfigItem(ImpPDFTabDialog* paParent);
+ void SetFilterConfigItem(ImpPDFTabDialog* paParent);
+ bool IsPdfaSelected() const { return mpCbPDFA1b->IsChecked(); }
};
-//class tab page viewer
+/// Class tab page viewer
class ImpPDFTabOpnFtrPage : public SfxTabPage
{
- VclPtr<RadioButton> mpRbOpnPageOnly;
- VclPtr<RadioButton> mpRbOpnOutline;
- VclPtr<RadioButton> mpRbOpnThumbs;
- VclPtr<NumericField> mpNumInitialPage;
-
- VclPtr<RadioButton> mpRbMagnDefault;
- VclPtr<RadioButton> mpRbMagnFitWin;
- VclPtr<RadioButton> mpRbMagnFitWidth;
- VclPtr<RadioButton> mpRbMagnFitVisible;
- VclPtr<RadioButton> mpRbMagnZoom;
- VclPtr<NumericField> mpNumZoom;
-
- VclPtr<RadioButton> mpRbPgLyDefault;
- VclPtr<RadioButton> mpRbPgLySinglePage;
- VclPtr<RadioButton> mpRbPgLyContinue;
- VclPtr<RadioButton> mpRbPgLyContinueFacing;
- VclPtr<CheckBox> mpCbPgLyFirstOnLeft;
-
- bool mbUseCTLFont;
+ VclPtr<RadioButton> mpRbOpnPageOnly;
+ VclPtr<RadioButton> mpRbOpnOutline;
+ VclPtr<RadioButton> mpRbOpnThumbs;
+ VclPtr<NumericField> mpNumInitialPage;
+
+ VclPtr<RadioButton> mpRbMagnDefault;
+ VclPtr<RadioButton> mpRbMagnFitWin;
+ VclPtr<RadioButton> mpRbMagnFitWidth;
+ VclPtr<RadioButton> mpRbMagnFitVisible;
+ VclPtr<RadioButton> mpRbMagnZoom;
+ VclPtr<NumericField> mpNumZoom;
+
+ VclPtr<RadioButton> mpRbPgLyDefault;
+ VclPtr<RadioButton> mpRbPgLySinglePage;
+ VclPtr<RadioButton> mpRbPgLyContinue;
+ VclPtr<RadioButton> mpRbPgLyContinueFacing;
+ VclPtr<CheckBox> mpCbPgLyFirstOnLeft;
+
+ bool mbUseCTLFont;
DECL_LINK_TYPED( ToggleRbPgLyContinueFacingHdl, RadioButton&, void );
DECL_LINK_TYPED( ToggleRbMagnHdl, RadioButton&, void );
- void ToggleRbPgLyContinueFacingHdl();
+
+ void ToggleRbPgLyContinueFacingHdl();
public:
- ImpPDFTabOpnFtrPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
+ ImpPDFTabOpnFtrPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabOpnFtrPage();
- virtual ~ImpPDFTabOpnFtrPage();
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet );
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
};
-//class tab page viewer
+/// Class tab page viewer
class ImpPDFTabViewerPage : public SfxTabPage
{
- VclPtr<CheckBox> m_pCbResWinInit;
- VclPtr<CheckBox> m_pCbCenterWindow;
- VclPtr<CheckBox> m_pCbOpenFullScreen;
- VclPtr<CheckBox> m_pCbDispDocTitle;
+ VclPtr<CheckBox> m_pCbResWinInit;
+ VclPtr<CheckBox> m_pCbCenterWindow;
+ VclPtr<CheckBox> m_pCbOpenFullScreen;
+ VclPtr<CheckBox> m_pCbDispDocTitle;
- VclPtr<CheckBox> m_pCbHideViewerMenubar;
- VclPtr<CheckBox> m_pCbHideViewerToolbar;
- VclPtr<CheckBox> m_pCbHideViewerWindowControls;
+ VclPtr<CheckBox> m_pCbHideViewerMenubar;
+ VclPtr<CheckBox> m_pCbHideViewerToolbar;
+ VclPtr<CheckBox> m_pCbHideViewerWindowControls;
- VclPtr<CheckBox> m_pCbTransitionEffects;
- bool mbIsPresentation;
+ VclPtr<CheckBox> m_pCbTransitionEffects;
+ bool mbIsPresentation;
- VclPtr<RadioButton> m_pRbAllBookmarkLevels;
- VclPtr<RadioButton> m_pRbVisibleBookmarkLevels;
- VclPtr<NumericField> m_pNumBookmarkLevels;
+ VclPtr<RadioButton> m_pRbAllBookmarkLevels;
+ VclPtr<RadioButton> m_pRbVisibleBookmarkLevels;
+ VclPtr<NumericField> m_pNumBookmarkLevels;
DECL_LINK_TYPED( ToggleRbBookmarksHdl, RadioButton&, void );
+
public:
- ImpPDFTabViewerPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
+ ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabViewerPage();
- virtual ~ImpPDFTabViewerPage();
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet );
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
};
-//class security tab page
+/// Class security tab page
class ImpPDFTabSecurityPage : public SfxTabPage
{
- VclPtr<PushButton> mpPbSetPwd;
- OUString msStrSetPwd;
+ VclPtr<PushButton> mpPbSetPwd;
+ OUString msStrSetPwd;
- VclPtr<VclContainer> mpUserPwdSet;
- VclPtr<VclContainer> mpUserPwdUnset;
- VclPtr<VclContainer> mpUserPwdPdfa;
+ VclPtr<VclContainer> mpUserPwdSet;
+ VclPtr<VclContainer> mpUserPwdUnset;
+ VclPtr<VclContainer> mpUserPwdPdfa;
- VclPtr<VclContainer> mpOwnerPwdSet;
- VclPtr<VclContainer> mpOwnerPwdUnset;
- VclPtr<VclContainer> mpOwnerPwdPdfa;
+ VclPtr<VclContainer> mpOwnerPwdSet;
+ VclPtr<VclContainer> mpOwnerPwdUnset;
+ VclPtr<VclContainer> mpOwnerPwdPdfa;
- VclPtr<VclContainer> mpPrintPermissions;
- VclPtr<RadioButton> mpRbPrintNone;
- VclPtr<RadioButton> mpRbPrintLowRes;
- VclPtr<RadioButton> mpRbPrintHighRes;
+ VclPtr<VclContainer> mpPrintPermissions;
+ VclPtr<RadioButton> mpRbPrintNone;
+ VclPtr<RadioButton> mpRbPrintLowRes;
+ VclPtr<RadioButton> mpRbPrintHighRes;
- VclPtr<VclContainer> mpChangesAllowed;
- VclPtr<RadioButton> mpRbChangesNone;
- VclPtr<RadioButton> mpRbChangesInsDel;
- VclPtr<RadioButton> mpRbChangesFillForm;
- VclPtr<RadioButton> mpRbChangesComment;
- VclPtr<RadioButton> mpRbChangesAnyNoCopy;
+ VclPtr<VclContainer> mpChangesAllowed;
+ VclPtr<RadioButton> mpRbChangesNone;
+ VclPtr<RadioButton> mpRbChangesInsDel;
+ VclPtr<RadioButton> mpRbChangesFillForm;
+ VclPtr<RadioButton> mpRbChangesComment;
+ VclPtr<RadioButton> mpRbChangesAnyNoCopy;
- VclPtr<VclContainer> mpContent;
- VclPtr<CheckBox> mpCbEnableCopy;
- VclPtr<CheckBox> mpCbEnableAccessibility;
+ VclPtr<VclContainer> mpContent;
+ VclPtr<CheckBox> mpCbEnableCopy;
+ VclPtr<CheckBox> mpCbEnableAccessibility;
OUString msUserPwdTitle;
@@ -369,82 +368,77 @@ class ImpPDFTabSecurityPage : public SfxTabPage
DECL_LINK_TYPED( ClickmaPbSetPwdHdl, Button*, void );
- void enablePermissionControls();
+ void enablePermissionControls();
public:
- ImpPDFTabSecurityPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
-
- virtual ~ImpPDFTabSecurityPage();
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet );
-
- void GetFilterConfigItem( ImpPDFTabDialog* paParent);
- void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
- void ImplPDFASecurityControl( bool bEnableSecurity );
- bool hasPassword() const { return mbHaveOwnerPassword || mbHaveUserPassword; }
+ ImpPDFTabSecurityPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabSecurityPage();
+
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+
+ void GetFilterConfigItem( ImpPDFTabDialog* paParent);
+ void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
+ void ImplPDFASecurityControl( bool bEnableSecurity );
+ bool hasPassword() const { return mbHaveOwnerPassword || mbHaveUserPassword; }
};
-//class to implement the relative link stuff
+
+/// Implements the relative link stuff
class ImpPDFTabLinksPage : public SfxTabPage
{
- VclPtr<CheckBox> m_pCbExprtBmkrToNmDst;
- VclPtr<CheckBox> m_pCbOOoToPDFTargets;
- VclPtr<CheckBox> m_pCbExportRelativeFsysLinks;
+ VclPtr<CheckBox> m_pCbExprtBmkrToNmDst;
+ VclPtr<CheckBox> m_pCbOOoToPDFTargets;
+ VclPtr<CheckBox> m_pCbExportRelativeFsysLinks;
- VclPtr<RadioButton> m_pRbOpnLnksDefault;
- bool mbOpnLnksDefaultUserState;
- VclPtr<RadioButton> m_pRbOpnLnksLaunch;
- bool mbOpnLnksLaunchUserState;
- VclPtr<RadioButton> m_pRbOpnLnksBrowser;
- bool mbOpnLnksBrowserUserState;
+ VclPtr<RadioButton> m_pRbOpnLnksDefault;
+ bool mbOpnLnksDefaultUserState;
+ VclPtr<RadioButton> m_pRbOpnLnksLaunch;
+ bool mbOpnLnksLaunchUserState;
+ VclPtr<RadioButton> m_pRbOpnLnksBrowser;
+ bool mbOpnLnksBrowserUserState;
DECL_LINK_TYPED( ClickRbOpnLnksDefaultHdl, Button*, void );
DECL_LINK_TYPED( ClickRbOpnLnksBrowserHdl, Button*, void );
public:
- ImpPDFTabLinksPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
+ ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabLinksPage();
- virtual ~ImpPDFTabLinksPage();
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet );
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
- void GetFilterConfigItem( ImpPDFTabDialog* paParent);
- void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
+ void GetFilterConfigItem( ImpPDFTabDialog* paParent);
+ void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
- void ImplPDFALinkControl( bool bEnableLaunch );
+ void ImplPDFALinkControl( bool bEnableLaunch );
};
//class to implement the digital signing
class ImpPDFTabSigningPage : public SfxTabPage
{
- VclPtr<Edit> mpEdSignCert;
- VclPtr<PushButton> mpPbSignCertSelect;
- VclPtr<PushButton> mpPbSignCertClear;
- VclPtr<Edit> mpEdSignPassword;
- VclPtr<Edit> mpEdSignLocation;
- VclPtr<Edit> mpEdSignContactInfo;
- VclPtr<Edit> mpEdSignReason;
- VclPtr<ListBox> mpLBSignTSA;
+ VclPtr<Edit> mpEdSignCert;
+ VclPtr<PushButton> mpPbSignCertSelect;
+ VclPtr<PushButton> mpPbSignCertClear;
+ VclPtr<Edit> mpEdSignPassword;
+ VclPtr<Edit> mpEdSignLocation;
+ VclPtr<Edit> mpEdSignContactInfo;
+ VclPtr<Edit> mpEdSignReason;
+ VclPtr<ListBox> mpLBSignTSA;
css::uno::Reference< css::security::XCertificate > maSignCertificate;
DECL_LINK_TYPED( ClickmaPbSignCertSelect, Button*, void );
DECL_LINK_TYPED( ClickmaPbSignCertClear, Button*, void );
public:
- ImpPDFTabSigningPage( vcl::Window* pParent,
- const SfxItemSet& rSet );
+ ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ virtual ~ImpPDFTabSigningPage();
- virtual ~ImpPDFTabSigningPage();
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
- const SfxItemSet* rAttrSet );
+ virtual void dispose() override;
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
- void GetFilterConfigItem( ImpPDFTabDialog* paParent);
- void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
+ void GetFilterConfigItem( ImpPDFTabDialog* paParent);
+ void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
};
#endif // INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 4c517cd3ead9..76d8952dc161 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -30,20 +30,16 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-
-// - PDFDialog functions -
-
-
#define SERVICE_NAME "com.sun.star.document.PDFDialog"
-
OUString PDFDialog_getImplementationName ()
throw (RuntimeException)
{
return OUString ( "com.sun.star.comp.PDF.PDFDialog" );
}
+
Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
throw (RuntimeException)
{
@@ -52,7 +48,6 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
}
-
Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
@@ -64,7 +59,6 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul
#undef SERVICE_NAME
-// - PDFDialog -
PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext )
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index f10e0430a696..70ed93cac052 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -26,16 +26,9 @@
#include <cppuhelper/implbase.hxx>
-// - PDFDialog -
-
-
namespace vcl { class Window; }
-typedef ::cppu::ImplInheritanceHelper <
- ::svt::OGenericUnoDialog,
- XPropertyAccess,
- XExporter
- > PDFDialog_Base;
+typedef ::cppu::ImplInheritanceHelper < ::svt::OGenericUnoDialog, XPropertyAccess, XExporter > PDFDialog_Base;
class PDFDialog : public PDFDialog_Base,
public ::comphelper::OPropertyArrayUsageHelper< PDFDialog >
@@ -60,10 +53,11 @@ protected:
using OPropertySetHelper::getPropertyValues;
virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) override;
using OPropertySetHelper::setPropertyValues;
- virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps )
+ throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
- // XExporter
- virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+ // XExporter
+ virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
public:
@@ -72,7 +66,6 @@ public:
};
-
OUString PDFDialog_getImplementationName () throw (RuntimeException);
Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException);
Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index d0f5796694cb..000bcb3deed4 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -18,63 +18,60 @@
*/
-#include "pdfexport.hxx"
-#include "impdialog.hxx"
-
-#include "pdf.hrc"
#include <osl/file.hxx>
-#include "tools/urlobj.hxx"
-#include "tools/fract.hxx"
-#include "tools/poly.hxx"
-#include "vcl/mapmod.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/metaact.hxx"
-#include "vcl/gdimtf.hxx"
-#include "vcl/jobset.hxx"
-#include "vcl/bitmapaccess.hxx"
-#include "vcl/svapp.hxx"
-#include "toolkit/awt/vclxdevice.hxx"
+#include <tools/urlobj.hxx>
+#include <tools/fract.hxx>
+#include <tools/poly.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/metaact.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/jobset.hxx>
+#include <vcl/bitmapaccess.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/settings.hxx>
-#include "svl/solar.hrc"
-#include "comphelper/sequence.hxx"
-#include "comphelper/string.hxx"
-#include "comphelper/storagehelper.hxx"
-#include "unotools/streamwrap.hxx"
-#include "com/sun/star/io/XSeekable.hpp"
-
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/polygon/b2dpolygontools.hxx"
-
-#include "unotools/saveopt.hxx"
-
-#include "vcl/graphictools.hxx"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/configuration/theDefaultProvider.hpp"
-#include "com/sun/star/awt/Rectangle.hpp"
-#include "com/sun/star/awt/XDevice.hpp"
-#include "com/sun/star/util/MeasureUnit.hpp"
-#include "com/sun/star/frame/XModel.hpp"
-#include "com/sun/star/frame/ModuleManager.hpp"
-#include "com/sun/star/frame/XStorable.hpp"
-#include "com/sun/star/frame/XController.hpp"
-#include "com/sun/star/document/XDocumentProperties.hpp"
-#include "com/sun/star/document/XDocumentPropertiesSupplier.hpp"
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/view/XViewSettingsSupplier.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/task/PDFExportException.hpp"
-
-#include "unotools/configmgr.hxx"
-#include "cppuhelper/exc_hlp.hxx"
+#include <vcl/graphictools.hxx>
+#include <svl/solar.hrc>
+#include <comphelper/sequence.hxx>
+#include <comphelper/string.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <toolkit/awt/vclxdevice.hxx>
+#include <unotools/streamwrap.hxx>
+#include <unotools/saveopt.hxx>
+#include <unotools/configmgr.hxx>
+#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/compbase.hxx>
-#include "cppuhelper/basemutex.hxx"
+#include <cppuhelper/basemutex.hxx>
+
+#include "pdfexport.hxx"
+#include "impdialog.hxx"
+#include "pdf.hrc"
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/view/XViewSettingsSupplier.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/PDFExportException.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/drawing/XShapes.hpp"
-#include "com/sun/star/graphic/XGraphicProvider.hpp"
#include <memory>
using namespace ::com::sun::star;
@@ -85,9 +82,6 @@ using namespace ::com::sun::star::view;
using namespace ::com::sun::star::graphic;
-// - PDFExport -
-
-
PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
const Reference< task::XStatusIndicator >& rxStatusIndicator,
const Reference< task::XInteractionHandler >& rxIH,
@@ -138,7 +132,7 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
mbCanCopyOrExtract ( true ),
mbCanExtractForAccessibility( true ),
-//--->i56629
+ // #i56629
mbExportRelativeFsysLinks ( false ),
mnDefaultLinkAction ( 0 ),
mbConvertOOoTargetToPDFTarget( false ),
@@ -148,13 +142,11 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
}
-
PDFExport::~PDFExport()
{
}
-
bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
Reference< css::view::XRenderable >& rRenderable,
const Any& rSelection,
@@ -246,7 +238,7 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
}
else
{
- bRet = true; // #i18334# SJ: nPageCount == 0,
+ bRet = true; // #i18334# nPageCount == 0,
rPDFWriter.NewPage( 10000, 10000 ); // creating dummy page
rPDFWriter.SetMapMode( MAP_100TH_MM );
}
@@ -260,10 +252,14 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
class PDFExportStreamDoc : public vcl::PDFOutputStream
{
+private:
+
Reference< XComponent > m_xSrcDoc;
Sequence< beans::NamedValue > m_aPreparedPassword;
- public:
- PDFExportStreamDoc( const Reference< XComponent >& xDoc, const Sequence<beans::NamedValue>& rPwd )
+
+public:
+
+ PDFExportStreamDoc( const Reference< XComponent >& xDoc, const Sequence<beans::NamedValue>& rPwd )
: m_xSrcDoc( xDoc ),
m_aPreparedPassword( rPwd )
{}
@@ -272,10 +268,12 @@ class PDFExportStreamDoc : public vcl::PDFOutputStream
virtual void write( const Reference< XOutputStream >& xStream ) override;
};
+
PDFExportStreamDoc::~PDFExportStreamDoc()
{
}
+
void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
{
Reference< css::frame::XStorable > xStore( m_xSrcDoc, UNO_QUERY );
@@ -301,6 +299,7 @@ void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
}
}
+
static OUString getMimetypeForDocument( const Reference< XComponentContext >& xContext,
const Reference< XComponent >& xDoc ) throw()
{
@@ -373,6 +372,7 @@ static OUString getMimetypeForDocument( const Reference< XComponentContext >& xC
return aDocMimetype;
}
+
bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData )
{
INetURLObject aURL( rFile );
@@ -473,7 +473,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
rFilterData[ nData ].Value >>= mnFormsFormat;
else if ( rFilterData[ nData ].Name == "AllowDuplicateFieldNames" )
rFilterData[ nData ].Value >>= mbAllowDuplicateFieldNames;
-//viewer properties
+ // viewer properties
else if ( rFilterData[ nData ].Name == "HideViewerToolbar" )
rFilterData[ nData ].Value >>= mbHideViewerToolbar;
else if ( rFilterData[ nData ].Name == "HideViewerMenubar" )
@@ -504,7 +504,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
rFilterData[ nData ].Value >>= mbAddStream;
else if ( rFilterData[ nData ].Name == "Watermark" )
rFilterData[ nData ].Value >>= msWatermark;
-//now all the security related properties...
+ // now all the security related properties...
else if ( rFilterData[ nData ].Name == "EncryptFile" )
rFilterData[ nData ].Value >>= mbEncrypt;
else if ( rFilterData[ nData ].Name == "DocumentOpenPassword" )
@@ -525,15 +525,15 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
rFilterData[ nData ].Value >>= mbCanCopyOrExtract;
else if ( rFilterData[ nData ].Name == "EnableTextAccessForAccessibilityTools" )
rFilterData[ nData ].Value >>= mbCanExtractForAccessibility;
-//--->i56629 links extra (relative links and other related stuff)
- else if ( rFilterData[ nData ].Name == "ExportLinksRelativeFsys" )
- rFilterData[ nData ].Value >>= mbExportRelativeFsysLinks;
- else if ( rFilterData[ nData ].Name == "PDFViewSelection" )
- rFilterData[ nData ].Value >>= mnDefaultLinkAction;
- else if ( rFilterData[ nData ].Name == "ConvertOOoTargetToPDFTarget" )
- rFilterData[ nData ].Value >>= mbConvertOOoTargetToPDFTarget;
- else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" )
- rFilterData[ nData ].Value >>= mbExportBmkToDest;
+ // i56629 links extra (relative links and other related stuff)
+ else if ( rFilterData[ nData ].Name == "ExportLinksRelativeFsys" )
+ rFilterData[ nData ].Value >>= mbExportRelativeFsysLinks;
+ else if ( rFilterData[ nData ].Name == "PDFViewSelection" )
+ rFilterData[ nData ].Value >>= mnDefaultLinkAction;
+ else if ( rFilterData[ nData ].Name == "ConvertOOoTargetToPDFTarget" )
+ rFilterData[ nData ].Value >>= mbConvertOOoTargetToPDFTarget;
+ else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" )
+ rFilterData[ nData ].Value >>= mbExportBmkToDest;
else if ( rFilterData[ nData ].Name == "ExportBookmarks" )
rFilterData[ nData ].Value >>= mbExportBookmarks;
else if ( rFilterData[ nData ].Name == "ExportHiddenSlides" )
@@ -555,9 +555,10 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
else if ( rFilterData[ nData ].Name == "SignatureTSA" )
rFilterData[ nData ].Value >>= msSignTSA;
}
+
aContext.URL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
-//set the correct version, depending on user request
+ // set the correct version, depending on user request
switch( mnPDFTypeSelection )
{
default:
@@ -566,22 +567,18 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
break;
case 1:
aContext.Version = vcl::PDFWriter::PDF_A_1;
- //force the tagged PDF as well
- mbUseTaggedPDF = true;
- //force disabling of form conversion
- mbExportFormFields = false;
- // PDF/A does not allow transparencies
- mbRemoveTransparencies = true;
- // no encryption
- mbEncrypt = false;
+ mbUseTaggedPDF = true; // force the tagged PDF as well
+ mbExportFormFields = false; // force disabling of form conversion
+ mbRemoveTransparencies = true; // PDF/A does not allow transparencies
+ mbEncrypt = false; // no encryption
xEnc.clear();
break;
}
-//copy in context the values default in the constructor or set by the FilterData sequence of properties
+ // copy in context the values default in the constructor or set by the FilterData sequence of properties
aContext.Tagged = mbUseTaggedPDF;
-//values used in viewer
+ // values used in viewer
aContext.HideViewerToolbar = mbHideViewerToolbar;
aContext.HideViewerMenubar = mbHideViewerMenubar;
aContext.HideViewerWindowControls = mbHideViewerWindowControls;
@@ -645,26 +642,25 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
aContext.FirstPageLeft = mbFirstPageLeft;
-//check if PDF/A, which does not allow encryption
+ // check if PDF/A, which does not allow encryption
if( aContext.Version != vcl::PDFWriter::PDF_A_1 )
{
-//set values needed in encryption
-//set encryption level, fixed, but here it can set by the UI if needed.
-// true is 128 bit, false 40
-//note that in 40 bit mode the UI needs reworking, since the current UI is meaningfull only for
-//128bit security mode
+ // set values needed in encryption
+ // set encryption level, fixed, but here it can set by the UI if needed.
+ // true is 128 bit, false 40
+ // note that in 40 bit mode the UI needs reworking, since the current UI is meaningfull only for
+ // 128bit security mode
aContext.Encryption.Security128bit = true;
-//set check for permission change password
-// if not enabled and no permission password, force permissions to default as if PDF where without encryption
+ // set check for permission change password
+ // if not enabled and no permission password, force permissions to default as if PDF where without encryption
if( mbRestrictPermissions && (xEnc.is() || !aPermissionPassword.isEmpty()) )
{
- mbEncrypt = true;
-//permission set as desired, done after
+ mbEncrypt = true; // permission set as desired, done after
}
else
{
-//force permission to default
+ // force permission to default
mnPrintAllowed = 2 ;
mnChangesAllowed = 4 ;
mbCanCopyOrExtract = true;
@@ -673,7 +669,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
switch( mnPrintAllowed )
{
- case 0: //initialized when aContext is build, means no printing
+ case 0: // initialized when aContext is build, means no printing
break;
default:
case 2:
@@ -685,7 +681,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
switch( mnChangesAllowed )
{
- case 0: //already in struct PDFSecPermissions CTOR
+ case 0: // already in struct PDFSecPermissions CTOR
break;
case 1:
aContext.Encryption.CanAssemble = true;
@@ -740,41 +736,42 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
}
aContext.AllowDuplicateFieldNames = mbAllowDuplicateFieldNames;
- //get model
+ // get model
Reference< frame::XModel > xModel( mxSrcDoc, UNO_QUERY );
{
-//---> i56629 Relative link stuff
-//set the base URL of the file:
-//then base URL
+ // #i56629: Relative link stuff
+ // set the base URL of the file: then base URL
aContext.BaseURL = xModel->getURL();
-//relative link option is private to PDF Export filter and limited to local filesystem only
+ // relative link option is private to PDF Export filter and limited to local filesystem only
aContext.RelFsys = mbExportRelativeFsysLinks;
-//determine the default acton for PDF links
+ // determine the default acton for PDF links
switch( mnDefaultLinkAction )
{
default:
-//default: URI, without fragment conversion (the bookmark in PDF may not work)
+ // default: URI, without fragment conversion (the bookmark in PDF may not work)
case 0:
aContext.DefaultLinkAction = vcl::PDFWriter::URIAction;
break;
-//view PDF through the reader application
case 1:
+ // view PDF through the reader application
aContext.ForcePDFAction = true;
aContext.DefaultLinkAction = vcl::PDFWriter::LaunchAction;
break;
-//view PDF through an Internet browser
case 2:
+ // view PDF through an Internet browser
aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination;
break;
}
aContext.ConvertOOoTargetToPDFTarget = mbConvertOOoTargetToPDFTarget;
-// check for Link Launch action, not allowed on PDF/A-1
-// this code chunk checks when the filter is called from scripting
+
+ // check for Link Launch action, not allowed on PDF/A-1
+ // this code chunk checks when the filter is called from scripting
if( aContext.Version == vcl::PDFWriter::PDF_A_1 &&
aContext.DefaultLinkAction == vcl::PDFWriter::LaunchAction )
- { //force the similar allowed URI action
+ {
+ // force the similar allowed URI action
aContext.DefaultLinkAction = vcl::PDFWriter::URIActionDestination;
- //and remove the remote goto action forced on PDF file
+ // and remove the remote goto action forced on PDF file
aContext.ForcePDFAction = false;
}
}
@@ -787,7 +784,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
aContext.SignCertificate = maSignCertificate;
aContext.SignTSA = msSignTSA;
-// all context data set, time to create the printing device
+ // all context data set, time to create the printing device
std::unique_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc ));
OutputDevice* pOut = pPDFWriter->GetReferenceDevice();
@@ -852,7 +849,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
if ( aCreator == "Writer" )
{
- //i92835 if Writer is in web layout mode this has to be switched to normal view and back to web view in the end
+ // #i92835: if Writer is in web layout mode this has to be switched to normal view and back to web view in the end
try
{
Reference< view::XViewSettingsSupplier > xVSettingsSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -880,9 +877,9 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
if ( mbExportNotesPages && aCreator == "Impress" )
{
- uno::Reference< drawing::XShapes > xShapes; // sj: do not allow to export notes when
- if ( ! ( aSelection >>= xShapes ) ) // exporting a selection -> todo: in the dialog
- bSecondPassForImpressNotes = true; // the export notes checkbox needs to be disabled
+ uno::Reference< drawing::XShapes > xShapes; // do not allow to export notes when exporting a selection
+ if ( ! ( aSelection >>= xShapes ) ) // TODO: in the dialog the export notes checkbox needs to be disabled
+ bSecondPassForImpressNotes = true;
}
if( aPageRange.isEmpty() )
@@ -958,6 +955,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
return bRet;
}
+
namespace
{
@@ -975,12 +973,14 @@ public:
virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) override;
};
+
PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) :
PDFErrorRequestBase( m_aMutex ),
maExc( i_rExc )
{
}
+
uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard const guard( m_aMutex );
@@ -990,12 +990,14 @@ uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException, st
return aRet;
}
+
uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFErrorRequest::getContinuations() throw (uno::RuntimeException, std::exception)
{
return uno::Sequence< uno::Reference< task::XInteractionContinuation > >();
}
-} // namespace
+} // end anonymous namespace
+
void PDFExport::showErrors( const std::set< vcl::PDFWriter::ErrorCode >& rErrors )
{
@@ -1009,7 +1011,6 @@ void PDFExport::showErrors( const std::set< vcl::PDFWriter::ErrorCode >& rErrors
}
-
bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
{
const Size aSizePDF( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_POINT ) );
@@ -1051,7 +1052,6 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData&
}
-
void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize )
{
vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) );
@@ -1119,5 +1119,4 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSi
rWriter.Pop();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index cdba3a6215d8..688ccadd86a4 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -32,9 +32,6 @@ class Size;
namespace vcl { class PDFWriter; }
-// - PDFExport -
-
-
class PDFExport
{
private:
@@ -45,31 +42,31 @@ private:
Reference< task::XInteractionHandler > mxIH;
bool mbUseTaggedPDF;
- sal_Int32 mnPDFTypeSelection;
+ sal_Int32 mnPDFTypeSelection;
bool mbExportNotes;
bool mbViewPDF;
bool mbExportNotesPages;
bool mbUseTransitionEffects;
bool mbExportBookmarks;
bool mbExportHiddenSlides;
- sal_Int32 mnOpenBookmarkLevels;
+ sal_Int32 mnOpenBookmarkLevels;
bool mbUseLosslessCompression;
bool mbReduceImageResolution;
bool mbSkipEmptyPages;
bool mbAddStream;
- sal_Int32 mnMaxImageResolution;
- sal_Int32 mnQuality;
- sal_Int32 mnFormsFormat;
+ sal_Int32 mnMaxImageResolution;
+ sal_Int32 mnQuality;
+ sal_Int32 mnFormsFormat;
bool mbExportFormFields;
bool mbAllowDuplicateFieldNames;
- sal_Int32 mnProgressValue;
+ sal_Int32 mnProgressValue;
bool mbRemoveTransparencies;
OUString msWatermark;
-//these variable are here only to have a location in filter/pdf to set the default
-//to be used by the macro (when the FilterData are set by the macro itself)
+ // these variable are here only to have a location in filter/pdf to set the default
+ // to be used by the macro (when the FilterData are set by the macro itself)
bool mbHideViewerToolbar;
bool mbHideViewerMenubar;
bool mbHideViewerWindowControls;
@@ -77,57 +74,58 @@ private:
bool mbCenterWindow;
bool mbOpenInFullScreenMode;
bool mbDisplayPDFDocumentTitle;
- sal_Int32 mnPDFDocumentMode;
- sal_Int32 mnPDFDocumentAction;
- sal_Int32 mnZoom;
- sal_Int32 mnInitialPage;
- sal_Int32 mnPDFPageLayout;
+ sal_Int32 mnPDFDocumentMode;
+ sal_Int32 mnPDFDocumentAction;
+ sal_Int32 mnZoom;
+ sal_Int32 mnInitialPage;
+ sal_Int32 mnPDFPageLayout;
bool mbFirstPageLeft;
bool mbEncrypt;
bool mbRestrictPermissions;
- sal_Int32 mnPrintAllowed;
- sal_Int32 mnChangesAllowed;
+ sal_Int32 mnPrintAllowed;
+ sal_Int32 mnChangesAllowed;
bool mbCanCopyOrExtract;
bool mbCanExtractForAccessibility;
-//--->i56629
+ // #i56629
bool mbExportRelativeFsysLinks;
- sal_Int32 mnDefaultLinkAction;
+ sal_Int32 mnDefaultLinkAction;
bool mbConvertOOoTargetToPDFTarget;
bool mbExportBmkToDest;
bool ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData& rPDFExtOutDevData,
- const GDIMetaFile& rMtf );
+ const GDIMetaFile& rMtf );
bool mbSignPDF;
- OUString msSignLocation;
- OUString msSignContact;
- OUString msSignReason;
- OUString msSignPassword;
+ OUString msSignLocation;
+ OUString msSignContact;
+ OUString msSignReason;
+ OUString msSignPassword;
Reference< security::XCertificate > maSignCertificate;
- OUString msSignTSA;
+ OUString msSignTSA;
+
+ void ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize );
- void ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize );
public:
- PDFExport( const Reference< XComponent >& rxSrcDoc,
- const Reference< task::XStatusIndicator >& xStatusIndicator,
- const Reference< task::XInteractionHandler >& xIH,
- const Reference< uno::XComponentContext >& xFact );
- ~PDFExport();
+ PDFExport( const Reference< XComponent >& rxSrcDoc,
+ const Reference< task::XStatusIndicator >& xStatusIndicator,
+ const Reference< task::XInteractionHandler >& xIH,
+ const Reference< uno::XComponentContext >& xFact );
+ ~PDFExport();
bool ExportSelection( vcl::PDFWriter& rPDFWriter,
- Reference< css::view::XRenderable >& rRenderable,
- const Any& rSelection,
- const StringRangeEnumerator& rRangeEnum,
- Sequence< PropertyValue >& rRenderOptions,
- sal_Int32 nPageCount );
+ Reference< css::view::XRenderable >& rRenderable,
+ const Any& rSelection,
+ const StringRangeEnumerator& rRangeEnum,
+ Sequence< PropertyValue >& rRenderOptions,
+ sal_Int32 nPageCount );
bool Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData );
- void showErrors( const std::set<vcl::PDFWriter::ErrorCode>& );
+ void showErrors( const std::set<vcl::PDFWriter::ErrorCode>& );
};
-#endif
+#endif // INCLUDED_FILTER_SOURCE_PDF_PDFEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 6d24356ff934..e587ba12d152 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -26,16 +26,18 @@
#include <vcl/FilterConfigItem.hxx>
#include <memory>
-// - PDFFilter -
+
PDFFilter::PDFFilter( const Reference< XComponentContext > &rxContext ) :
mxContext( rxContext )
{
}
+
PDFFilter::~PDFFilter()
{
}
+
bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
{
Reference< XOutputStream > xOStm;
@@ -59,7 +61,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
}
/* we don't get FilterData if we are exporting directly
- to pdf, but we have to use the last user settings (especially for the CompressMode) */
+ to pdf, but we have to use the last user settings (especially for the CompressMode) */
if ( !aFilterData.getLength() )
{
FilterConfigItem aCfgItem( "Office.Common/Filter/PDF/Export/" );
@@ -87,12 +89,12 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
aCfgItem.ReadInt32( "PageLayout", 0 );
aCfgItem.ReadBool( "FirstPageOnLeft", false );
aCfgItem.ReadBool( "IsAddStream", false );
-//
-// the encryption is not available when exporting directly, since the encryption is off by default and the selection
-// (encrypt or not) is not persistent; it's available through macro though,
-// provided the correct property values are set, see help
-//
-// now, the relative link stuff
+
+ // the encryption is not available when exporting directly, since the encryption is off by default and the selection
+ // (encrypt or not) is not persistent; it's available through macro though,
+ // provided the correct property values are set, see help
+
+ // now, the relative link stuff
aCfgItem.ReadBool( "ExportLinksRelativeFsys", false );
aCfgItem.ReadInt32("PDFViewSelection", 0 );
aCfgItem.ReadBool( "ConvertOOoTargetToPDFTarget", false );
@@ -103,6 +105,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
aCfgItem.ReadInt32( "OpenBookmarkLevels", -1 );
aFilterData = aCfgItem.GetFilterData();
}
+
if( mxSrcDoc.is() && xOStm.is() )
{
PDFExport aExport( mxSrcDoc, xStatusIndicator, xIH, mxContext );
@@ -131,7 +134,10 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
class FocusWindowWaitCursor
{
+private:
+
VclPtr<vcl::Window> m_pFocusWindow;
+
public:
FocusWindowWaitCursor() :
m_pFocusWindow( Application::GetFocusWindow() )
@@ -142,6 +148,7 @@ public:
m_pFocusWindow->EnterWait();
}
}
+
~FocusWindowWaitCursor()
{
if( m_pFocusWindow )
@@ -154,12 +161,14 @@ public:
DECL_LINK_TYPED( DestroyedLink, VclWindowEvent&, void );
};
+
IMPL_LINK_TYPED( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
{
if( rEvent.GetId() == VCLEVENT_OBJECT_DYING )
m_pFocusWindow = nullptr;
}
+
sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException, std::exception)
{
@@ -171,13 +180,11 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto
}
-
void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException, std::exception)
{
}
-
void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc )
throw (IllegalArgumentException, RuntimeException, std::exception)
{
@@ -185,31 +192,32 @@ void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc
}
-
void SAL_CALL PDFFilter::initialize( const css::uno::Sequence< css::uno::Any >& )
throw (Exception, RuntimeException, std::exception)
{
}
+
OUString PDFFilter_getImplementationName ()
throw (RuntimeException)
{
return OUString ( "com.sun.star.comp.PDF.PDFFilter" );
}
+
Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) throw (RuntimeException)
{
Sequence<OUString> aRet { "com.sun.star.document.PDFFilter" };
return aRet;
}
+
Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
{
return static_cast<cppu::OWeakObject*>(new PDFFilter( comphelper::getComponentContext(rSMgr) ));
}
-
OUString SAL_CALL PDFFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
@@ -217,7 +225,6 @@ OUString SAL_CALL PDFFilter::getImplementationName()
}
-
sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName )
throw (RuntimeException, std::exception)
{
@@ -225,7 +232,6 @@ sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName )
}
-
css::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
{
return PDFFilter_getSupportedServiceNames();
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 637fb3937b99..df52a406932e 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -49,18 +49,12 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::io;
-// - PDFFilter -
-
-
-class PDFFilter : public cppu::WeakImplHelper < XFilter,
- XExporter,
- XInitialization,
- XServiceInfo >
+class PDFFilter : public cppu::WeakImplHelper < XFilter, XExporter, XInitialization, XServiceInfo >
{
private:
- Reference< XComponentContext > mxContext;
- Reference< XComponent > mxSrcDoc;
+ Reference< XComponentContext > mxContext;
+ Reference< XComponent > mxSrcDoc;
bool implExport( const Sequence< PropertyValue >& rDescriptor );
@@ -88,22 +82,18 @@ public:
};
-
OUString PDFFilter_getImplementationName ()
throw ( RuntimeException );
-
bool SAL_CALL PDFFilter_supportsService( const OUString& ServiceName )
throw ( RuntimeException );
-
Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( )
throw ( RuntimeException );
-
Reference< XInterface >
SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw ( Exception );
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index bae82a81d3ab..28c69e7437a2 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -25,21 +25,24 @@
#include "com/sun/star/task/PDFExportException.hpp"
#include <cppuhelper/supportsservice.hxx>
-// - PDFInteractionHandler -
+
PDFInteractionHandler::PDFInteractionHandler()
{
}
+
PDFInteractionHandler::~PDFInteractionHandler()
{
}
+
void SAL_CALL PDFInteractionHandler::handle( const Reference< task::XInteractionRequest >& i_xRequest )
throw (RuntimeException, std::exception)
{
handleInteractionRequest( i_xRequest );
}
+
sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Reference< task::XInteractionRequest >& i_xRequest )
throw (RuntimeException, std::exception)
{
@@ -60,35 +63,41 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
return bHandled;
}
+
OUString PDFInteractionHandler_getImplementationName ()
throw (RuntimeException)
{
return OUString ( "com.sun.star.comp.PDF.PDFExportInteractionHandler" );
}
+
Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ) throw (RuntimeException)
{
Sequence<OUString> aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" };
return aRet;
}
+
Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) throw( Exception )
{
return static_cast<cppu::OWeakObject*>(new PDFInteractionHandler);
}
+
OUString SAL_CALL PDFInteractionHandler::getImplementationName()
throw (RuntimeException, std::exception)
{
return PDFInteractionHandler_getImplementationName();
}
+
sal_Bool SAL_CALL PDFInteractionHandler::supportsService( const OUString& rServiceName )
throw (RuntimeException, std::exception)
{
return cppu::supportsService( this, rServiceName );
}
+
css::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
{
return PDFInteractionHandler_getSupportedServiceNames();
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index 99a80cca3be0..fe4a600260c5 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -20,19 +20,17 @@
#ifndef INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
#define INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
-#include "com/sun/star/lang/XServiceInfo.hpp"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-// - PDFFilter -
-
-
class PDFInteractionHandler : public cppu::WeakImplHelper < task::XInteractionHandler2,
XServiceInfo >
{
@@ -47,6 +45,7 @@ protected:
// XIniteractionHandler2
virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) override;
+
public:
PDFInteractionHandler();
@@ -54,22 +53,18 @@ public:
};
-
OUString PDFInteractionHandler_getImplementationName ()
throw ( RuntimeException );
-
bool SAL_CALL PDFInteractionHandler_supportsService( const OUString& ServiceName )
throw ( RuntimeException );
-
Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( )
throw ( RuntimeException );
-
Reference< XInterface >
SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw ( Exception );
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index 98be90cb3290..592ed457421a 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -19,21 +19,19 @@
#include "impsvgdialog.hxx"
+
#include <cstdio>
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
+
inline sal_Int32 implMap( vcl::Window& /*rWnd*/, sal_Int32 nVal )
{
- //return( rWnd.LogicToLogic( Size( nVal, nVal ) ).Height(), MAP_APPFONT, MAP_APPFONT );
return( nVal << 1 );
}
-// - ImpSVGDialog -
-
-
ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) :
ModalDialog( pParent ),
maFI( VclPtr<FixedLine>::Create(this) ),
@@ -91,12 +89,12 @@ ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi
}
-
ImpSVGDialog::~ImpSVGDialog()
{
disposeOnce();
}
+
void ImpSVGDialog::dispose()
{
maFI.disposeAndClear();
@@ -111,7 +109,6 @@ void ImpSVGDialog::dispose()
}
-
Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
{
maConfigItem.WriteBool( SVG_PROP_TINYPROFILE, maCBTinyProfile->IsChecked() );
@@ -122,7 +119,6 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
}
-
IMPL_LINK_TYPED( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void )
{
if( &rBox == maCBTinyProfile.get() )
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index 2d7be2ff33e6..d3a7b31f42bc 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -20,15 +20,15 @@
#ifndef INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX
#define INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
#include <vcl/FilterConfigItem.hxx>
+#include <svtools/stdctrl.hxx>
+
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/beans/PropertyValue.hpp>
#define SVG_EXPORTFILTER_CONFIGPATH "Office.Common/Filter/SVG/Export/"
#define SVG_PROP_TINYPROFILE "TinyMode"
@@ -38,12 +38,10 @@
#define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters"
-// - ImpSVGDialog -
-
-
class ResMgr;
namespace vcl { class Window; }
+
class ImpSVGDialog : public ModalDialog
{
private:
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index c10f892e312b..1564a480d24e 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -42,15 +42,13 @@ using namespace ::com::sun::star::view;
using namespace ::com::sun::star::document;
-// - SVGDialog functions -
-
-
OUString SVGDialog_getImplementationName ()
throw (RuntimeException)
{
return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME );
}
+
Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
throw (RuntimeException)
{
@@ -59,7 +57,6 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
}
-
Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
throw( Exception )
{
@@ -67,22 +64,17 @@ Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMul
}
-// - SVGDialog -
-
-
SVGDialog::SVGDialog( const Reference< XComponentContext > &rxContext ) :
OGenericUnoDialog( rxContext )
{
}
-
SVGDialog::~SVGDialog()
{
}
-
Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
throw (RuntimeException, std::exception)
{
@@ -98,7 +90,6 @@ Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
}
-
void SAL_CALL SVGDialog::acquire()
throw ()
{
@@ -106,7 +97,6 @@ void SAL_CALL SVGDialog::acquire()
}
-
void SAL_CALL SVGDialog::release()
throw ()
{
@@ -114,7 +104,6 @@ void SAL_CALL SVGDialog::release()
}
-
Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
throw(RuntimeException, std::exception)
{
@@ -122,7 +111,6 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
}
-
OUString SAL_CALL SVGDialog::getImplementationName()
throw (RuntimeException, std::exception)
{
@@ -130,7 +118,6 @@ OUString SAL_CALL SVGDialog::getImplementationName()
}
-
Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
@@ -138,7 +125,6 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
}
-
VclPtr<Dialog> SVGDialog::createDialog( vcl::Window* pParent )
{
if( mxSrcDoc.is() )
@@ -148,7 +134,6 @@ VclPtr<Dialog> SVGDialog::createDialog( vcl::Window* pParent )
}
-
void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
{
if( nExecutionResult && m_pDialog )
@@ -158,7 +143,6 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
}
-
Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
throw(RuntimeException, std::exception)
{
@@ -182,7 +166,6 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
}
-
Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
throw ( RuntimeException, std::exception )
{
@@ -206,7 +189,6 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
}
-
void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
{
@@ -223,7 +205,6 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
}
-
void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc )
throw(IllegalArgumentException, RuntimeException, std::exception)
{
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 1f1553d71880..0dad0f74ad19 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -28,9 +28,6 @@
#include <memory>
-// - SVGDialog -
-
-
class ResMgr;
class SVGDialog : public ::svt::OGenericUnoDialog,
@@ -77,26 +74,22 @@ public:
};
-
OUString SVGDialog_getImplementationName ()
throw ( css::uno::RuntimeException );
-
bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName )
throw ( css::uno::RuntimeException );
-
css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( )
throw ( css::uno::RuntimeException );
-
css::uno::Reference< css::uno::XInterface >
SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
throw ( css::uno::Exception );
-#endif // SVGDialog_HXX
+#endif // INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ce4aeecfacfb..7caf71d94b57 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -59,7 +59,6 @@ using namespace ::xmloff::token;
// - ooo elements and attributes -
-
#define NSPREFIX "ooo:"
// ooo xml elements
@@ -99,13 +98,9 @@ static const char aOOOAttrTextAdjust[] = NSPREFIX "text-adjust";
static const char constSvgNamespace[] = "http://www.w3.org/2000/svg";
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * - Text Field Class Hierarchy - *
- * *
- * This is a set of classes for exporting text field meta info. *
- * *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Text Field Class Hierarchy
+ This is a set of classes for exporting text field meta info.
+ */
class TextField
{
@@ -145,6 +140,7 @@ protected:
}
};
+
class FixedTextField : public TextField
{
public:
@@ -171,6 +167,7 @@ public:
virtual ~FixedTextField() {}
};
+
class FixedDateTimeField : public FixedTextField
{
public:
@@ -186,6 +183,7 @@ public:
virtual ~FixedDateTimeField() {}
};
+
class FooterField : public FixedTextField
{
public:
@@ -202,6 +200,7 @@ public:
virtual ~FooterField() {}
};
+
class VariableTextField : public TextField
{
public:
@@ -212,6 +211,7 @@ public:
virtual ~VariableTextField() {}
};
+
class VariableDateTimeField : public VariableTextField
{
public:
@@ -310,17 +310,13 @@ public:
virtual ~VariableDateTimeField() {}
};
+
bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField )
{
return aLhsTextField.equalTo( aRhsTextField );
}
-
-
-// - SVGExport -
-
-
SVGExport::SVGExport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
const Reference< XDocumentHandler >& rxHandler,
@@ -379,23 +375,18 @@ SVGExport::SVGExport(
}
-
SVGExport::~SVGExport()
{
GetDocHandler()->endDocument();
}
-// - ObjectRepresentation -
-
-
ObjectRepresentation::ObjectRepresentation() :
mpMtf( nullptr )
{
}
-
ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObject,
const GDIMetaFile& rMtf ) :
mxObject( rxObject ),
@@ -404,7 +395,6 @@ ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObj
}
-
ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresentation ) :
mxObject( rPresentation.mxObject ),
mpMtf( rPresentation.mpMtf ? new GDIMetaFile( *rPresentation.mpMtf ) : nullptr )
@@ -412,14 +402,12 @@ ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresent
}
-
ObjectRepresentation::~ObjectRepresentation()
{
delete mpMtf;
}
-
ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentation& rPresentation )
{
// Check for self-assignment
@@ -432,7 +420,6 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio
}
-
namespace
{
@@ -466,7 +453,8 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction )
return nChecksum;
}
-}
+} // end anonymous namespace
+
void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
{
@@ -497,7 +485,6 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
}
-
size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const
{
const GDIMetaFile& aMtf = rObjRep.GetRepresentation();
@@ -513,7 +500,6 @@ size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const
}
-
bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
const ObjectRepresentation& rObjRep2 ) const
{
@@ -533,19 +519,15 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
}
-
-// - SVGFilter -
-
-
bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException, std::exception)
{
- Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ) ;
- Reference< XOutputStream > xOStm;
- std::unique_ptr<SvStream> pOStm;
- sal_Int32 nLength = rDescriptor.getLength();
- const PropertyValue* pValue = rDescriptor.getConstArray();
- bool bRet = false;
+ Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ) ;
+ Reference< XOutputStream > xOStm;
+ std::unique_ptr<SvStream> pOStm;
+ sal_Int32 nLength = rDescriptor.getLength();
+ const PropertyValue* pValue = rDescriptor.getConstArray();
+ bool bRet = false;
maFilterData.realloc( 0 );
@@ -628,11 +610,11 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
if( mpSdrModel )
{
- //fdo#62682 The maNewFieldHdl can end up getting copied
- //into various other outliners which live past this
- //method, so get the full list of outliners and restore
- //the maOldFieldHdl for all that have ended up using
- //maNewFieldHdl
+ // fdo#62682 The maNewFieldHdl can end up getting copied
+ // into various other outliners which live past this
+ // method, so get the full list of outliners and restore
+ // the maOldFieldHdl for all that have ended up using
+ // maNewFieldHdl
std::vector<SdrOutliner*> aOutliners(mpSdrModel->GetActiveOutliners());
for (auto aIter = aOutliners.begin(); aIter != aOutliners.end(); ++aIter)
{
@@ -655,7 +637,6 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
}
-
Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm )
{
Reference< XWriter > xSaxWriter;
@@ -670,7 +651,6 @@ Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference
}
-
bool SVGFilter::implLookForFirstVisiblePage()
{
sal_Int32 nCurPage = 0, nLastPage = mSelectedPages.getLength() - 1;
@@ -916,11 +896,7 @@ bool SVGFilter::implExportDocument()
}
-
-// Append aField to aFieldSet if it is not already present in the set
-// and create the field id sFieldId
-
-
+/// Append aField to aFieldSet if it is not already present in the set and create the field id sFieldId
template< typename TextFieldType >
OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
const TextFieldType & aField,
@@ -949,7 +925,6 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
}
-
void SVGFilter::implGenerateMetaData()
{
sal_Int32 nCount = mSelectedPages.getLength();
@@ -967,11 +942,8 @@ void SVGFilter::implGenerateMetaData()
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrUsePositionedChars, "true" );
}
- /*
- * Add a (global) Page Numbering Type attribute for the document
- */
- // NOTE:
- // at present pSdrModel->GetPageNumType() returns always SVX_ARABIC
+ // Add a (global) Page Numbering Type attribute for the document
+ // NOTE: at present pSdrModel->GetPageNumType() returns always SVX_ARABIC
// so the following code fragment is pretty unuseful
sal_Int32 nPageNumberingType = SVX_ARABIC;
SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( mSelectedPages[0] );
@@ -1001,10 +973,10 @@ void SVGFilter::implGenerateMetaData()
case SVX_ROMAN_LOWER:
sNumberingType = "roman-lower";
break;
- // arabic numbering type is the default, so we do not append any attribute for it
case SVX_ARABIC:
- // in case the numbering type is not handled we fall back on arabic numbering
+ // arabic numbering type is the default, so we do not append any attribute for it
default:
+ // in case the numbering type is not handled we fall back on arabic numbering
break;
}
if( !sNumberingType.isEmpty() )
@@ -1069,18 +1041,15 @@ void SVGFilter::implGenerateMetaData()
bool bDateTimeVisibility = true; // default: visible
bool bFooterVisibility = true; // default: visible
- /*
- * Page Number Field
- */
+ // Page Number Field
xPropSet->getPropertyValue( "IsPageNumberVisible" ) >>= bPageNumberVisibility;
bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != SVX_NUMBER_NONE );
if( bPageNumberVisibility ) // visibility default value: 'hidden'
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrPageNumberVisibility, "visible" );
}
- /*
- * Date/Time Field
- */
+
+ // Date/Time Field
xPropSet->getPropertyValue( "IsDateTimeVisible" ) >>= bDateTimeVisibility;
if( bDateTimeVisibility ) // visibility default value: 'visible'
{
@@ -1106,9 +1075,8 @@ void SVGFilter::implGenerateMetaData()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeVisibility, "hidden" );
}
- /*
- * Footer Field
- */
+
+ // Footer Field
xPropSet->getPropertyValue( "IsFooterVisible" ) >>= bFooterVisibility;
if( bFooterVisibility ) // visibility default value: 'visible'
{
@@ -1167,6 +1135,7 @@ void SVGFilter::implGenerateMetaData()
}
}
}
+
// text fields are used only for generating meta info so we don't need them anymore
for( size_t i = 0; i < aFieldSet.size(); ++i )
{
@@ -1180,7 +1149,6 @@ void SVGFilter::implGenerateMetaData()
}
-
void SVGFilter::implExportAnimations()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "presentation-animations" );
@@ -1241,7 +1209,6 @@ void SVGFilter::implExportAnimations()
}
-
void SVGFilter::implExportTextShapeIndex()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextShapeIndex" );
@@ -1267,7 +1234,6 @@ void SVGFilter::implExportTextShapeIndex()
}
-
void SVGFilter::implEmbedBulletGlyphs()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBulletChars" );
@@ -1296,7 +1262,6 @@ void SVGFilter::implEmbedBulletGlyphs()
}
-
void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData )
{
OUString sId = "bullet-char-template(" + OUString::number( (sal_Int32)cBullet ) + ")";
@@ -1315,10 +1280,9 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
}
-
/** SVGFilter::implExportTextEmbeddedBitmaps
- * We export bitmaps embedded into text shapes, such as those used by list
- * items with image style, only once in a specific <defs> element.
+ We export bitmaps embedded into text shapes, such as those used by list
+ items with image style, only once in a specific defs element.
*/
void SVGFilter::implExportTextEmbeddedBitmaps()
{
@@ -1384,7 +1348,6 @@ void SVGFilter::implExportTextEmbeddedBitmaps()
}
-
#define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \
xExtDocHandler->unknown( aFragment ## n );
@@ -1404,7 +1367,6 @@ void SVGFilter::implGenerateScript()
}
-
Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
const Reference< XPropertySet > & rxPropSet,
const Reference< XPropertySetInfo > & rxPropSetInfo )
@@ -1418,13 +1380,8 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
}
-
-/* SVGFilter::implGetPagePropSet
- *
- * We collect info on master page elements visibility,
- * and placeholder text shape content.
- * This method is used when exporting a single page
- * as implGenerateMetaData is not invoked.
+/** We collect info on master page elements visibility, and placeholder text shape content.
+ This method is used when exporting a single page as implGenerateMetaData is not invoked.
*/
void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
{
@@ -1438,9 +1395,7 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
mVisiblePagePropSet.nDateTimeFormat = SVXDATEFORMAT_B;
mVisiblePagePropSet.nPageNumberingType = SVX_ARABIC;
- /* We collect info on master page elements visibility,
- * and placeholder text shape content.
- */
+ // We collect info on master page elements visibility, and placeholder text shape content.
Reference< XPropertySet > xPropSet( rxPage, UNO_QUERY );
if( xPropSet.is() )
{
@@ -1476,8 +1431,6 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
}
-
-
bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage > > & rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage )
{
@@ -1531,7 +1484,6 @@ bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage >
}
-
void SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage )
{
@@ -1725,13 +1677,10 @@ bool SVGFilter::implExportPage( const OUString & sPageId,
}
-
-
-bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
- bool bMaster )
+bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, bool bMaster )
{
Reference< XShape > xShape;
- bool bRet = false;
+ bool bRet = false;
for( sal_Int32 i = 0, nCount = rxShapes->getCount(); i < nCount; ++i )
{
@@ -1746,11 +1695,10 @@ bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
-bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
- bool bMaster )
+bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, bool bMaster )
{
- Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY );
- bool bRet = false;
+ Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY );
+ bool bRet = false;
if( xShapePropSet.is() )
{
@@ -1923,7 +1871,6 @@ bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
}
-
bool SVGFilter::implCreateObjects()
{
if (mbExportShapeSelection)
@@ -2008,7 +1955,6 @@ bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPa
}
-
bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
{
bool bRet = false;
@@ -2126,7 +2072,6 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag
}
-
void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
{
Reference< XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( mxContext );
@@ -2152,7 +2097,6 @@ void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& r
}
-
OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
{
OUString aRet;
@@ -2183,7 +2127,6 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
}
-
void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf )
{
if( rxIf.is() )
@@ -2191,14 +2134,12 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf )
}
-
const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf )
{
return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf );
}
-
OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
{
Reference< XNamed > xNamed( rxIf, UNO_QUERY );
@@ -2211,7 +2152,6 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
}
-
IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
{
bool bFieldProcessed = false;
@@ -2398,7 +2338,6 @@ IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
}
-
void SVGExport::writeMtf( const GDIMetaFile& rMtf )
{
const Size aSize( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_MM ) );
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index ebc5513cd7b3..121704a93738 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -22,7 +22,6 @@
#include "svgfilter.hxx"
#include "svgwriter.hxx"
-
#include <vcl/unohelp.hxx>
#include <vcl/font.hxx>
#include <vcl/outdev.hxx>
@@ -31,9 +30,6 @@
static const sal_Int32 nFontEM = 2048;
-// - SVGFontExport -
-
-
SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) :
mrExport( rExport ),
maObjects( rObjects ),
@@ -42,13 +38,11 @@ SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRep
}
-
SVGFontExport::~SVGFontExport()
{
}
-
SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont )
{
FontWeight eWeight( WEIGHT_NORMAL );
@@ -75,11 +69,10 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont
}
-
void SVGFontExport::implCollectGlyphs()
{
ScopedVclPtrInstance< VirtualDevice > pVDev;
- ObjectVector::const_iterator aIter( maObjects.begin() );
+ ObjectVector::const_iterator aIter( maObjects.begin() );
pVDev->EnableOutput( false );
@@ -176,7 +169,6 @@ void SVGFontExport::implCollectGlyphs()
}
-
void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
{
if( mrExport.IsEmbedFonts() )
@@ -258,7 +250,6 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
}
-
void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr )
{
tools::PolyPolygon aPolyPoly;
@@ -293,7 +284,6 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr
}
-
void SVGFontExport::EmbedFonts()
{
implCollectGlyphs();
@@ -331,7 +321,6 @@ void SVGFontExport::EmbedFonts()
}
-
OUString SVGFontExport::GetMappedFontName( const OUString& rFontName ) const
{
sal_Int32 nNextTokenPos( 0 );
diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx
index 771d565f173c..576e813696e2 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -31,10 +31,6 @@
#include <tools/fontenum.hxx>
-// - SVGFontExport -
-
-
-
class ObjectRepresentation;
class SVGExport;
namespace vcl { class Font; }
@@ -43,12 +39,12 @@ class OutputDevice;
class SVGFontExport
{
- typedef ::std::vector< ObjectRepresentation > ObjectVector;
+ typedef ::std::vector< ObjectRepresentation > ObjectVector;
typedef ::std::set< OUString, ::std::greater< OUString > > GlyphSet;
- typedef ::std::map< FontItalic, GlyphSet > FontItalicMap;
- typedef ::std::map< FontWeight, FontItalicMap > FontWeightMap;
- typedef ::std::map< OUString, FontWeightMap > FontNameMap;
- typedef FontNameMap GlyphTree;
+ typedef ::std::map< FontItalic, GlyphSet > FontItalicMap;
+ typedef ::std::map< FontWeight, FontItalicMap > FontWeightMap;
+ typedef ::std::map< OUString, FontWeightMap > FontNameMap;
+ typedef FontNameMap GlyphTree;
private:
@@ -71,6 +67,6 @@ public:
OUString GetMappedFontName( const OUString& rFontName ) const;
};
-#endif
+#endif // INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 46b69d9e15fd..89d954d6bbbb 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -101,17 +101,20 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont
{
}
+
SVGAttributeWriter::~SVGAttributeWriter()
{
delete mpElemPaint;
delete mpElemFont;
}
+
double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs )
{
return floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs );
}
+
void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, OUString& rColorStr )
{
if( rColor.GetTransparency() == 255 )
@@ -123,6 +126,7 @@ void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, OUString& rColorS
}
}
+
void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName,
const char* pColorOpacityAttrName,
const Color& rColor )
@@ -140,6 +144,7 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName,
mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorOpacityAttrName, aColorOpacity );
}
+
void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFillColor,
const Rectangle* pObjBoundRect, const Gradient* pFillGradient )
{
@@ -163,6 +168,7 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi
AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor );
}
+
void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, OUString& rGradientId )
{
if( rObjRect.GetWidth() && rObjRect.GetHeight() &&
@@ -284,6 +290,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
rGradientId.clear();
}
+
void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont )
{
if( rFont != maCurFont )
@@ -351,6 +358,7 @@ void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont )
}
}
+
void SVGAttributeWriter::startFontSettings()
{
endFontSettings();
@@ -364,6 +372,7 @@ void SVGAttributeWriter::startFontSettings()
}
}
+
void SVGAttributeWriter::endFontSettings()
{
if( mpElemFont )
@@ -373,6 +382,7 @@ void SVGAttributeWriter::endFontSettings()
}
}
+
void SVGAttributeWriter::setFontFamily()
{
if( mrExport.IsUsePositionedCharacters() )
@@ -401,57 +411,62 @@ void SVGAttributeWriter::setFontFamily()
}
}
+
SVGTextWriter::SVGTextWriter( SVGExport& rExport )
- : mrExport( rExport ),
- mpContext( nullptr ),
- mpVDev( nullptr ),
- mbIsTextShapeStarted( false ),
- mrTextShape(),
- msShapeId(),
- mrParagraphEnumeration(),
- mrCurrentTextParagraph(),
- mrTextPortionEnumeration(),
- mrCurrentTextPortion(),
- mpTextEmbeddedBitmapMtf( nullptr ),
- mpTargetMapMode( nullptr ),
- mpTextShapeElem( nullptr ),
- mpTextParagraphElem( nullptr ),
- mpTextPositionElem( nullptr ),
- mnLeftTextPortionLength( 0 ),
- maTextPos(0,0),
- mnTextWidth(0),
- mbPositioningNeeded( false ),
- mbIsNewListItem( false ),
- meNumberingType(0),
- mcBulletChar(0),
- maBulletListItemMap(),
- mbIsListLevelStyleImage( false ),
- mbLineBreak( false ),
- mbIsURLField( false ),
- msUrl(),
- mbIsPlaceholderShape( false ),
- mbIWS( false ),
- maCurrentFont(),
- maParentFont()
+: mrExport( rExport ),
+ mpContext( nullptr ),
+ mpVDev( nullptr ),
+ mbIsTextShapeStarted( false ),
+ mrTextShape(),
+ msShapeId(),
+ mrParagraphEnumeration(),
+ mrCurrentTextParagraph(),
+ mrTextPortionEnumeration(),
+ mrCurrentTextPortion(),
+ mpTextEmbeddedBitmapMtf( nullptr ),
+ mpTargetMapMode( nullptr ),
+ mpTextShapeElem( nullptr ),
+ mpTextParagraphElem( nullptr ),
+ mpTextPositionElem( nullptr ),
+ mnLeftTextPortionLength( 0 ),
+ maTextPos(0,0),
+ mnTextWidth(0),
+ mbPositioningNeeded( false ),
+ mbIsNewListItem( false ),
+ meNumberingType(0),
+ mcBulletChar(0),
+ maBulletListItemMap(),
+ mbIsListLevelStyleImage( false ),
+ mbLineBreak( false ),
+ mbIsURLField( false ),
+ msUrl(),
+ mbIsPlaceholderShape( false ),
+ mbIWS( false ),
+ maCurrentFont(),
+ maParentFont()
{
}
+
SVGTextWriter::~SVGTextWriter()
{
endTextParagraph();
}
+
void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf )
{
if( rxIf.is() )
(mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf );
}
+
const OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf )
{
return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf );
}
+
void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const
{
if( mpVDev && mpTargetMapMode )
@@ -460,6 +475,7 @@ void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const
OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." );
}
+
void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const
{
if( mpVDev && mpTargetMapMode )
@@ -468,6 +484,7 @@ void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const
OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." );
}
+
void SVGTextWriter::implSetCurrentFont()
{
if( mpVDev )
@@ -485,6 +502,7 @@ void SVGTextWriter::implSetCurrentFont()
}
}
+
template< typename SubType >
bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
@@ -499,6 +517,7 @@ bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos
return false;
}
+
template<>
bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
@@ -513,6 +532,7 @@ bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* p
return false;
}
+
template< typename SubType >
bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
@@ -522,6 +542,7 @@ bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Po
return true;
}
+
/** setTextPosition
* Set the start position of the next line of text. In case no text is found
* the current action index is updated to the index value we reached while
@@ -655,6 +676,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
}
}
+
void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction )
{
sal_uLong nCount = rMtf.GetActionSize();
@@ -723,6 +745,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
}
}
+
void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
{
implSetCurrentFont();
@@ -837,6 +860,7 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
}
}
+
void SVGTextWriter::implSetFontFamily()
{
sal_Int32 nNextTokenPos( 0 );
@@ -858,6 +882,7 @@ void SVGTextWriter::implSetFontFamily()
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily );
}
+
void SVGTextWriter::createParagraphEnumeration()
{
if( mrTextShape.is() )
@@ -881,6 +906,7 @@ void SVGTextWriter::createParagraphEnumeration()
}
}
+
bool SVGTextWriter::nextParagraph()
{
mrTextPortionEnumeration.clear();
@@ -1036,6 +1062,7 @@ bool SVGTextWriter::nextParagraph()
return false;
}
+
bool SVGTextWriter::nextTextPortion()
{
mrCurrentTextPortion.clear();
@@ -1157,6 +1184,7 @@ bool SVGTextWriter::nextTextPortion()
return false;
}
+
void SVGTextWriter::startTextShape()
{
if( mpTextShapeElem )
@@ -1189,6 +1217,7 @@ void SVGTextWriter::startTextShape()
}
}
+
void SVGTextWriter::endTextShape()
{
endTextParagraph();
@@ -1211,6 +1240,7 @@ void SVGTextWriter::endTextShape()
}
+
void SVGTextWriter::startTextParagraph()
{
endTextParagraph();
@@ -1247,6 +1277,7 @@ void SVGTextWriter::startTextParagraph()
}
}
+
void SVGTextWriter::endTextParagraph()
{
mrCurrentTextPortion.clear();
@@ -1263,6 +1294,7 @@ void SVGTextWriter::endTextParagraph()
}
+
void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY )
{
endTextPosition();
@@ -1276,6 +1308,7 @@ void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY )
mpTextPositionElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS );
}
+
void SVGTextWriter::endTextPosition()
{
if( mpTextPositionElem )
@@ -1285,6 +1318,7 @@ void SVGTextWriter::endTextPosition()
}
}
+
void SVGTextWriter::implExportHyperlinkIds()
{
if( !msHyperlinkIdList.isEmpty() )
@@ -1296,6 +1330,7 @@ void SVGTextWriter::implExportHyperlinkIds()
}
}
+
void SVGTextWriter::implWriteBulletChars()
{
if( maBulletListItemMap.empty() )
@@ -1351,11 +1386,11 @@ void SVGTextWriter::implWriteBulletChars()
} // close aBulletCharElem
}
-
// clear the map
maBulletListItemMap.clear();
}
+
template< typename MetaBitmapActionType >
void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction )
{
@@ -1383,6 +1418,7 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction
endTextPosition();
}
+
void SVGTextWriter::implWriteEmbeddedBitmaps()
{
if( mpTextEmbeddedBitmapMtf && mpTextEmbeddedBitmapMtf->GetActionSize() )
@@ -1461,6 +1497,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
}
}
+
void SVGTextWriter::writeTextPortion( const Point& rPos,
const OUString& rText,
bool bApplyMapping )
@@ -1545,6 +1582,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
}
}
+
void SVGTextWriter::implWriteTextPortion( const Point& rPos,
const OUString& rText,
Color aTextColor,
@@ -1661,6 +1699,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
mnTextWidth += mpVDev->GetTextWidth( sTextContent );
}
+
SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport ) :
mnCurGradientId( 1 ),
mnCurMaskId( 1 ),
@@ -1679,12 +1718,14 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport
maTextWriter.setVirtualDevice( mpVDev, maTargetMapMode );
}
+
SVGActionWriter::~SVGActionWriter()
{
DBG_ASSERT( !mpContext, "Not all contexts are closed" );
mpVDev.disposeAndClear();
}
+
long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
{
Size aSz( nVal, nVal );
@@ -1692,16 +1733,19 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
return ImplMap( aSz, aSz ).Width();
}
+
Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const
{
return( rDstPt = OutputDevice::LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) );
}
+
Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const
{
return( rDstSz = OutputDevice::LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) );
}
+
Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const
{
Point aTL( rRect.TopLeft() );
@@ -1710,6 +1754,7 @@ Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect
return( rDstRect = Rectangle( ImplMap( aTL, aTL ), ImplMap( aSz, aSz ) ) );
}
+
tools::Polygon& SVGActionWriter::ImplMap( const tools::Polygon& rPoly, tools::Polygon& rDstPoly ) const
{
rDstPoly = tools::Polygon( rPoly.GetSize() );
@@ -1723,6 +1768,7 @@ tools::Polygon& SVGActionWriter::ImplMap( const tools::Polygon& rPoly, tools::Po
return rDstPoly;
}
+
tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const
{
tools::Polygon aPoly;
@@ -1737,6 +1783,7 @@ tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPol
return rDstPolyPoly;
}
+
OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine )
{
OUString aPathData;
@@ -1802,6 +1849,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
return aPathData;
}
+
BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction )
{
GDIMetaFile aMtf;
@@ -1811,6 +1859,7 @@ BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction )
return aMtf.GetChecksum();
}
+
void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
const Color* pLineColor, bool bApplyMapping )
{
@@ -1843,6 +1892,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
}
}
+
void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
bool bApplyMapping )
{
@@ -1869,6 +1919,7 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
}
}
+
void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY,
bool bApplyMapping )
{
@@ -1889,6 +1940,7 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
}
}
+
void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
bool bApplyMapping )
{
@@ -1944,6 +1996,7 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
}
+
void SVGActionWriter::ImplWritePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bLineOnly,
bool bApplyMapping )
{
@@ -1963,6 +2016,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const tools::PolyPolygon& rPolyPoly,
}
}
+
void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bApplyMapping )
{
tools::PolyPolygon aPolyPoly;
@@ -2054,6 +2108,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp
ImplWritePolyPolygon( aPolyPoly, bLineOnly, false );
}
+
void SVGActionWriter::ImplWritePattern( const tools::PolyPolygon& rPolyPoly,
const Hatch* pHatch,
const Gradient* pGradient,
@@ -2111,6 +2166,7 @@ void SVGActionWriter::ImplWritePattern( const tools::PolyPolygon& rPolyPoly,
}
}
+
void SVGActionWriter::ImplWriteGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient,
sal_uInt32 nWriteFlags)
{
@@ -2125,6 +2181,7 @@ void SVGActionWriter::ImplWriteGradientEx( const tools::PolyPolygon& rPolyPoly,
}
}
+
void SVGActionWriter::ImplWriteGradientLinear( const tools::PolyPolygon& rPolyPoly,
const Gradient& rGradient )
{
@@ -2232,6 +2289,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const tools::PolyPolygon& rPolyPo
}
}
+
void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset )
{
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( fOffset ) );
@@ -2247,6 +2305,7 @@ void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset
}
}
+
Color SVGActionWriter::ImplGetColorWithIntensity( const Color& rColor,
sal_uInt16 nIntensity )
{
@@ -2256,6 +2315,7 @@ Color SVGActionWriter::ImplGetColorWithIntensity( const Color& rColor,
return Color( nNewRed, nNewGreen, nNewBlue);
}
+
Color SVGActionWriter::ImplGetGradientColor( const Color& rStartColor,
const Color& rEndColor,
double fOffset )
@@ -2275,6 +2335,7 @@ Color SVGActionWriter::ImplGetGradientColor( const Color& rStartColor,
return Color( (sal_uInt8)nNewRed, (sal_uInt8)nNewGreen, (sal_uInt8)nNewBlue );
}
+
void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
const Point& rDestPt,
const Size& rDestSize,
@@ -2334,6 +2395,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
}
}
+
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const long* pDXArray, long nWidth,
bool bApplyMapping )
@@ -2424,6 +2486,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
}
}
+
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const long* pDXArray, long nWidth,
Color aTextColor, bool bApplyMapping )
@@ -2608,6 +2671,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
}
}
+
void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
const Point& rPt, const Size& rSz,
const Point& rSrcPt, const Size& rSrcSz,
@@ -2659,6 +2723,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
}
}
+
void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
sal_uInt32 nWriteFlags,
const OUString* pElementId,
@@ -3587,6 +3652,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
}
+
vcl::Font SVGActionWriter::ImplSetCorrectFontHeight() const
{
vcl::Font aFont( mpVDev->GetFont() );
@@ -3599,6 +3665,7 @@ vcl::Font SVGActionWriter::ImplSetCorrectFontHeight() const
return aFont;
}
+
void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
const Size& rSize100thmm,
const GDIMetaFile& rMtf,
@@ -3641,9 +3708,6 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
}
-// - SVGWriter -
-
-
SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentContext >& rxCtx )
: mxContext(rxCtx)
{
@@ -3652,13 +3716,11 @@ SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentCont
}
-
SVGWriter::~SVGWriter()
{
}
-
void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler,
const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception )
{
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 9d9f3e463a46..441aeedd3d42 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -69,22 +69,17 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::svg;
using namespace ::com::sun::star::xml::sax;
-
-
#define SVG_DTD_STRING "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">"
#define SVGWRITER_WRITE_FILL 0x00000001
#define SVGWRITER_WRITE_TEXT 0x00000002
#define SVGWRITER_NO_SHAPE_COMMENTS 0x01000000
-
-// - SVGAttributeWriter -
-
-
class SVGActionWriter;
class SVGExport;
class SVGFontExport;
+
class SVGAttributeWriter
{
private:
@@ -143,15 +138,11 @@ struct SVGShapeDescriptor
};
-
class SVGAttributeWriter;
class SVGExport;
class GDIMetaFile;
-
-// - BulletListItemInfo -
-
struct BulletListItemInfo
{
long nFontSize;
@@ -161,9 +152,6 @@ struct BulletListItemInfo
};
-
-// - SVGTextWriter -
-
class SVGTextWriter
{
public:
@@ -270,9 +258,6 @@ class SVGTextWriter
};
-// - SVGActionWriter -
-
-
class SVGActionWriter
{
private:
@@ -366,6 +351,7 @@ public:
const GDIMetaFile* pTextEmbeddedBitmapMtf = nullptr );
};
+
class SVGWriter : public cppu::WeakImplHelper< XSVGWriter >
{
private:
@@ -383,6 +369,6 @@ public:
const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) override;
};
-#endif
+#endif // INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 0c66a21d1c96..e279cde4cef8 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -32,8 +32,6 @@
#include "svtools/imageresourceaccess.hxx"
#include <comphelper/processfactory.hxx>
-// - ImgProdLockBytes -
-
class ImgProdLockBytes : public SvLockBytes
{
@@ -54,14 +52,12 @@ public:
};
-
ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, bool bOwner ) :
SvLockBytes( pStm, bOwner )
{
}
-
ImgProdLockBytes::ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStmRef ) :
xStmRef( rStmRef )
{
@@ -88,11 +84,11 @@ ImgProdLockBytes::ImgProdLockBytes( css::uno::Reference< css::io::XInputStream >
}
-
ImgProdLockBytes::~ImgProdLockBytes()
{
}
+
ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos,
void* pBuffer, sal_Size nCount, sal_Size * pRead) const
{
@@ -123,6 +119,7 @@ ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos,
}
}
+
ErrCode ImgProdLockBytes::WriteAt(sal_uInt64 const nPos,
const void* pBuffer, sal_Size nCount, sal_Size * pWritten)
{
@@ -136,14 +133,12 @@ ErrCode ImgProdLockBytes::WriteAt(sal_uInt64 const nPos,
}
-
ErrCode ImgProdLockBytes::Flush() const
{
return ERRCODE_NONE;
}
-
ErrCode ImgProdLockBytes::SetSize(sal_uInt64 const nSize)
{
if( GetStream() )
@@ -156,7 +151,6 @@ ErrCode ImgProdLockBytes::SetSize(sal_uInt64 const nSize)
}
-
ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFlag ) const
{
if( GetStream() )
@@ -169,7 +163,7 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla
}
}
-// - ImageProducer -
+
ImageProducer::ImageProducer()
: mpStm(nullptr)
, mnTransIndex(0)
@@ -187,7 +181,8 @@ ImageProducer::~ImageProducer()
mpStm = nullptr;
}
-// css::uno::XInterface
+
+// XInterface
css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
css::uno::Any aRet = ::cppu::queryInterface( rType,
@@ -197,7 +192,6 @@ css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) thro
}
-
void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer )
throw(css::uno::RuntimeException,
std::exception)
@@ -208,7 +202,6 @@ void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageCons
}
-
void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception)
{
ConsumerList_t::reverse_iterator riter = std::find(maConsList.rbegin(),maConsList.rend(),rxConsumer);
@@ -218,7 +211,6 @@ void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageC
}
-
void ImageProducer::SetImage( const OUString& rPath )
{
maURL = rPath;
@@ -240,7 +232,6 @@ void ImageProducer::SetImage( const OUString& rPath )
}
-
void ImageProducer::SetImage( SvStream& rStm )
{
maURL.clear();
@@ -252,7 +243,6 @@ void ImageProducer::SetImage( SvStream& rStm )
}
-
void ImageProducer::setImage( css::uno::Reference< css::io::XInputStream > & rInputStmRef )
{
maURL.clear();
@@ -267,7 +257,6 @@ void ImageProducer::setImage( css::uno::Reference< css::io::XInputStream > & rIn
}
-
void ImageProducer::NewDataAvailable()
{
if( ( GRAPHIC_NONE == mpGraphic->GetType() ) || mpGraphic->GetContext() )
@@ -275,7 +264,6 @@ void ImageProducer::NewDataAvailable()
}
-
void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exception)
{
if( !maConsList.empty() || maDoneHdl.IsSet() )
@@ -320,7 +308,6 @@ void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exc
}
-
bool ImageProducer::ImplImportGraphic( Graphic& rGraphic )
{
if (!mpStm)
@@ -340,7 +327,6 @@ bool ImageProducer::ImplImportGraphic( Graphic& rGraphic )
}
-
void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
{
ImplInitConsumer( rGraphic );
@@ -360,7 +346,6 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
}
-
void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
{
Bitmap aBmp( rGraphic.GetBitmapEx().GetBitmap() );
@@ -431,7 +416,6 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
}
-
void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
@@ -538,6 +522,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
}
}
+
void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if ( aArguments.getLength() == 1 )
@@ -551,6 +536,7 @@ void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArgu
}
}
+
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_form_ImageProducer_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 5bda64f12cfa..49e1107893d2 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -29,11 +29,6 @@
#include <vector>
-// - ImageProducer -
-
-
-
-
class SvStream;
class Graphic;
@@ -58,7 +53,7 @@ private:
bool mbConsInit;
Link<Graphic*,void> maDoneHdl;
- bool ImplImportGraphic( Graphic& rGraphic );
+ bool ImplImportGraphic( Graphic& rGraphic );
void ImplUpdateData( const Graphic& rGraphic );
void ImplInitConsumer( const Graphic& rGraphic );
void ImplUpdateConsumer( const Graphic& rGraphic );
@@ -76,9 +71,9 @@ public:
void SetDoneHdl( const Link<Graphic*,void>& i_rHdl ) { maDoneHdl = i_rHdl; }
// css::uno::XInterface
- css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
- void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
- void SAL_CALL release() throw() override { OWeakObject::release(); }
+ css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
+ void SAL_CALL release() throw() override { OWeakObject::release(); }
// MT: ???
void setImage( css::uno::Reference< css::io::XInputStream > & rStmRef );
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index fb989ad3476f..0c8a88c07be6 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -384,7 +384,7 @@ ColumnDef *HWPFile::GetColumnDef(int num)
for(int i = 0; it != columnlist.end() ; ++it, i++){
if( i == num )
- break;
+ break;
}
if( it != columnlist.end() )
@@ -411,8 +411,8 @@ HyperText *HWPFile::GetHyperText()
std::list<HyperText*>::iterator it = hyperlist.begin();
for( int i = 0; it != hyperlist.end(); ++it, i++ ){
- if( i == currenthyper )
- break;
+ if( i == currenthyper )
+ break;
}
currenthyper++;
@@ -468,8 +468,8 @@ ParaShape *HWPFile::getParaShape(int index)
std::list<ParaShape*>::iterator it = pslist.begin();
for( int i = 0; it != pslist.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != pslist.end() ? *it : nullptr;
@@ -481,8 +481,8 @@ CharShape *HWPFile::getCharShape(int index)
std::list<CharShape*>::iterator it = cslist.begin();
for( int i = 0; it != cslist.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != cslist.end() ? *it : nullptr;
@@ -494,8 +494,8 @@ FBoxStyle *HWPFile::getFBoxStyle(int index)
std::list<FBoxStyle*>::iterator it = fbslist.begin();
for( int i = 0; it != fbslist.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != fbslist.end() ? *it : nullptr;
@@ -506,8 +506,8 @@ DateCode *HWPFile::getDateCode(int index)
std::list<DateCode*>::iterator it = datecodes.begin();
for( int i = 0; it != datecodes.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != datecodes.end() ? *it : nullptr;
@@ -518,8 +518,8 @@ HeaderFooter *HWPFile::getHeaderFooter(int index)
std::list<HeaderFooter*>::iterator it = headerfooters.begin();
for( int i = 0; it != headerfooters.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != headerfooters.end() ? *it : nullptr;
@@ -530,8 +530,8 @@ ShowPageNum *HWPFile::getPageNumber(int index)
std::list<ShowPageNum*>::iterator it = pagenumbers.begin();
for( int i = 0; it != pagenumbers.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != pagenumbers.end() ? *it : nullptr;
@@ -543,8 +543,8 @@ Table *HWPFile::getTable(int index)
std::list<Table*>::iterator it = tables.begin();
for( int i = 0; it != tables.end(); ++it, i++ ){
- if( i == index )
- break;
+ if( i == index )
+ break;
}
return it != tables.end() ? *it : nullptr;
@@ -555,22 +555,24 @@ void HWPFile::AddParaShape(ParaShape * pshape)
int nscount = 0;
for(int j = 0 ; j < MAXTABS-1 ; j++)
{
- if( j > 0 && pshape->tabs[j].position == 0 )
- break;
- if( pshape->tabs[0].position == 0 ){
- if( pshape->tabs[j].type || pshape->tabs[j].dot_continue ||
- (pshape->tabs[j].position != 1000 *j) )
- nscount = j;
- }
- else{
- if( pshape->tabs[j].type || pshape->tabs[j].dot_continue ||
- (pshape->tabs[j].position != 1000 * (j + 1)) )
- nscount = j;
+ if( j > 0 && pshape->tabs[j].position == 0 )
+ break;
+ if( pshape->tabs[0].position == 0 ){
+ if( pshape->tabs[j].type || pshape->tabs[j].dot_continue ||
+ (pshape->tabs[j].position != 1000 *j) )
+ nscount = j;
+ }
+ else {
+ if( pshape->tabs[j].type || pshape->tabs[j].dot_continue ||
+ (pshape->tabs[j].position != 1000 * (j + 1)) )
+ nscount = j;
}
}
if( nscount )
pshape->tabs[MAXTABS-1].type = sal::static_int_cast<char>(nscount);
- int value = compareParaShape(pshape);
+
+ int value = compareParaShape(pshape);
+
if( value == 0 || nscount )
{
pshape->index = ++pcount;
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index d217517f35c2..26431583bf29 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -277,7 +277,7 @@ sal_Int32 compileFile(const OString * pathname)
} while( nIndex != -1 );
}
- if ( pOptions->isValid("-I") )
+ if ( pOptions->isValid("-I") )
{
OString token, incOpt = pOptions->getOption("-I");
sal_Int32 nIndex = 0;
@@ -291,7 +291,7 @@ sal_Int32 compileFile(const OString * pathname)
lCppArgs.push_back(OUString("-o"));
- cppArgs.append(preprocFile);
+ cppArgs.append(preprocFile);
lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
cppArgs.append(tmpFile);
@@ -325,12 +325,12 @@ sal_Int32 compileFile(const OString * pathname)
::std::vector< OUString >::iterator iter = lCppArgs.begin();
::std::vector< OUString >::iterator end = lCppArgs.end();
int i = 0;
- while ( iter != end ) {
+ while ( iter != end ) {
pCmdArgs[i++] = (*iter).pData;
++iter;
}
- procError = osl_executeProcess( cpp.pData, pCmdArgs, nCmdArgs, osl_Process_WAIT,
+ procError = osl_executeProcess( cpp.pData, pCmdArgs, nCmdArgs, osl_Process_WAIT,
nullptr, startDir.pData, nullptr, 0, &hProcess );
oslProcessInfo hInfo;
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
index 541c5d3c4d58..8d68e2bbb1ff 100644
--- a/include/avmedia/modeltools.hxx
+++ b/include/avmedia/modeltools.hxx
@@ -28,7 +28,7 @@ bool AVMEDIA_DLLPUBLIC Embed3DModel(
bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);
-} // namespace avemdia
+} // namespace avmedia
#endif // INCLUDED_AVMEDIA_MODELTOOLS_HXX
diff --git a/include/helpcompiler/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx
index 65f77878ed12..869fe535ab7f 100644
--- a/include/helpcompiler/HelpIndexer.hxx
+++ b/include/helpcompiler/HelpIndexer.hxx
@@ -30,7 +30,7 @@ class Reader;
}
class L10N_DLLPUBLIC HelpIndexer {
- private:
+ private:
OUString d_lang;
OUString d_module;
OUString d_captionDir;
@@ -39,48 +39,48 @@ class L10N_DLLPUBLIC HelpIndexer {
OUString d_error;
std::set<OUString> d_files;
- public:
+ public:
- /**
- * @param lang Help files language.
- * @param module The module of the helpfiles.
- * @param srcDir The help directory to index
- * @param outDir The directory to write the "module".idxl directory to
- */
+ /**
+ * @param lang Help files language.
+ * @param module The module of the helpfiles.
+ * @param srcDir The help directory to index
+ * @param outDir The directory to write the "module".idxl directory to
+ */
HelpIndexer(OUString const &lang, OUString const &module,
OUString const &srcDir, OUString const &outDir);
- /**
- * Run the indexer.
- * @return true if index successfully generated.
- */
- bool indexDocuments();
+ /**
+ * Run the indexer.
+ * @return true if index successfully generated.
+ */
+ bool indexDocuments();
- /**
- * Get the error string (empty if no error occurred).
- */
+ /**
+ * Get the error string (empty if no error occurred).
+ */
OUString const & getErrorMessage() { return d_error;}
- private:
+ private:
- /**
- * Scan the caption & contents directories for help files.
- */
- bool scanForFiles();
+ /**
+ * Scan the caption & contents directories for help files.
+ */
+ bool scanForFiles();
- /**
- * Scan for files in the given directory.
- */
+ /**
+ * Scan for files in the given directory.
+ */
bool scanForFiles(OUString const &path);
- /**
- * Fill the Document with information on the given help file.
- */
+ /**
+ * Fill the Document with information on the given help file.
+ */
void helpDocument(OUString const & fileName, lucene::document::Document *doc);
- /**
- * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist.
- */
+ /**
+ * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist.
+ */
static lucene::util::Reader *helpFileReader(OUString const & path);
};
diff --git a/include/helpcompiler/HelpSearch.hxx b/include/helpcompiler/HelpSearch.hxx
index 639bbb2f585a..074373c43c0e 100644
--- a/include/helpcompiler/HelpSearch.hxx
+++ b/include/helpcompiler/HelpSearch.hxx
@@ -16,23 +16,23 @@
#include <vector>
class L10N_DLLPUBLIC HelpSearch{
- private:
+ private:
OString d_indexDir;
- public:
+ public:
- /**
- * @param indexDir The directory where the index files are stored.
- */
+ /**
+ * @param indexDir The directory where the index files are stored.
+ */
HelpSearch(OUString const &indexDir);
- /**
- * Query the index for a certain query string.
- * @param queryStr The query.
- * @param captionOnly Set to true to search in the caption, not the content.
- * @param rDocuments Vector to write the paths of the found documents.
- * @param rScores Vector to write the scores to.
- */
+ /**
+ * Query the index for a certain query string.
+ * @param queryStr The query.
+ * @param captionOnly Set to true to search in the caption, not the content.
+ * @param rDocuments Vector to write the paths of the found documents.
+ * @param rScores Vector to write the scores to.
+ */
void query(OUString const &queryStr, bool captionOnly,
std::vector<OUString> &rDocuments, std::vector<float> &rScores);
};
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 55a3daa96e9d..b942cbcf7f38 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -116,9 +116,6 @@ enum Paper
#define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_10 - PAPER_A0 + 1)
-// - Paper -
-
-
class I18NUTIL_DLLPUBLIC PaperInfo
{
Paper m_eType;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 35b4040a7515..283c369f0de4 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -32,9 +32,6 @@
#include <sfx2/tabdlg.hxx>
-// - SfxCommonPrintOptionsTabPage -
-
-
class SvtBasePrintOptions;
class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index c634ae135000..aef9bed26559 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -49,9 +49,6 @@ typedef ::std::vector< long > DdeFormats;
typedef ::std::vector< Conversation* > ConvList;
-// - DdeData -
-
-
class SVL_DLLPUBLIC DdeData
{
friend class DdeInternal;
@@ -83,9 +80,6 @@ public:
};
-// - DdeTransaction -
-
-
class SVL_DLLPUBLIC DdeTransaction
{
public:
@@ -133,9 +127,6 @@ private:
};
-// - DdeLink -
-
-
class SVL_DLLPUBLIC DdeLink : public DdeTransaction
{
Link<void*,void> aNotify;
@@ -150,9 +141,6 @@ public:
};
-// - DdeWarmLink -
-
-
class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
{
public:
@@ -160,9 +148,6 @@ public:
};
-// - DdeHotLink -
-
-
class SVL_DLLPUBLIC DdeHotLink : public DdeLink
{
public:
@@ -170,9 +155,6 @@ public:
};
-// - DdeRequest -
-
-
class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
{
public:
@@ -180,9 +162,6 @@ public:
};
-// - DdePoke -
-
-
class SVL_DLLPUBLIC DdePoke : public DdeTransaction
{
public:
@@ -193,9 +172,6 @@ public:
};
-// - DdeExecute -
-
-
class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
{
public:
@@ -203,9 +179,6 @@ public:
};
-// - DdeConnection -
-
-
class SVL_DLLPUBLIC DdeConnection
{
friend class DdeInternal;
@@ -235,9 +208,6 @@ private:
};
-// - DdeItem -
-
-
class SVL_DLLPUBLIC DdeItem
{
friend class DdeInternal;
@@ -264,9 +234,6 @@ public:
};
-// - DdeItem -
-
-
class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem
{
public:
@@ -280,9 +247,6 @@ public:
};
-// - DdeTopic -
-
-
class SVL_DLLPUBLIC DdeTopic
{
SVL_DLLPRIVATE void Disconnect( sal_IntPtr );
@@ -330,9 +294,6 @@ private:
};
-// - DdeService -
-
-
class SVL_DLLPUBLIC DdeService
{
friend class DdeInternal;
@@ -378,16 +339,9 @@ public:
void AddFormat(SotClipboardFormatId);
void RemoveFormat(SotClipboardFormatId);
bool HasFormat(SotClipboardFormatId);
-
-private:
- // DdeService( const DdeService& );
- //int operator= ( const DdeService& );
};
-// - DdeTransaction -
-
-
inline long DdeTransaction::GetError()
{
return rDde.GetError();
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index cad8aaaf1d3e..f81fb46fe4eb 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -46,14 +46,11 @@ namespace svt {
class BrowseBoxImpl;
class IAccessibleFactory;
}
+
namespace utl {
class AccessibleStateSetHelper;
}
-
-// - BrowseBox-Types -
-
-
#define BROWSER_INVALIDID SAL_MAX_UINT16
#define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION))
@@ -125,9 +122,6 @@ namespace o3tl
#define BROWSER_MOVECOLUMNRIGHT 757
-// - BrowseEvent -
-
-
class BrowseEvent
{
VclPtr<vcl::Window> pWin;
@@ -151,9 +145,6 @@ public:
};
-// - BrowserMouseEvent -
-
-
class BrowserMouseEvent: public MouseEvent, public BrowseEvent
{
public:
@@ -165,9 +156,6 @@ public:
};
-// - BrowserAcceptDropEvent -
-
-
class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent
{
public:
@@ -176,9 +164,6 @@ public:
};
-// - BrowserExecuteDropEvent -
-
-
class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent
{
public:
@@ -187,9 +172,6 @@ public:
};
-// - BrowseBox -
-
-
// TODO
// The whole selection thingie in this class is somewhat .... suspicious to me.
// some oddities:
@@ -271,8 +253,7 @@ private:
} uRow;
MultiSelection* pColSel; // selected column-ids
- //fdo#83943, detect if making the cursor position
- //visible is impossible to achieve
+ // fdo#83943, detect if making the cursor position visible is impossible to achieve
struct CursorMoveAttempt
{
long m_nCol;
@@ -670,7 +651,6 @@ public:
/// return <TRUE/> if and only if the accessible object for this instance has been created and is alive
bool isAccessibleAlive( ) const;
- // ACCESSIBILITY ==========================================================
public:
/** Creates and returns the accessible object of the whole BrowseBox. */
virtual css::uno::Reference<
@@ -710,8 +690,6 @@ public:
css::accessibility::XAccessible >
CreateAccessibleControl( sal_Int32 nIndex ) override;
- // Conversions ------------------------------------------------------------
-
/** Converts a point relative to the data window origin to a cell address.
@param rnRow Out-parameter that takes the row index.
@param rnColumnId Out-parameter that takes the column ID.
@@ -741,8 +719,6 @@ public:
@return <TRUE/>, if the point could be converted to a valid index. */
virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) override;
- // Object data and state --------------------------------------------------
-
/** return the name of the specified object.
@param eObjType
The type to ask for
@@ -825,6 +801,6 @@ inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const
return *static_cast<DataFlavorExVector*>(implGetDataFlavors());
}
-#endif
+#endif // INCLUDED_SVTOOLS_BRWBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index da98035a8dac..265a5983ea80 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -131,15 +131,11 @@ calls or by ending a selection.
*************************************************************************/
-
-// - Calendar types -
-
-
#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000)
#define WB_BOLDTEXT ((WinBits)0x00008000)
#define WB_FRAMEINFO ((WinBits)0x00010000)
#define WB_WEEKNUMBER ((WinBits)0x00020000)
-// Needs to in agreement with the WinBits in the TabBar or
+// Needs to be in agreement with the WinBits in the TabBar or
// we move it to \vcl\inc\wintypes.hxx
#ifndef WB_RANGESELECT
#define WB_RANGESELECT ((WinBits)0x00200000)
@@ -150,10 +146,6 @@ calls or by ending a selection.
#define DIB_BOLD ((sal_uInt16)0x0001)
-
-// - Calendar -
-
-
typedef std::set<sal_uInt32> IntDateSet;
@@ -231,7 +223,7 @@ private:
SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const;
SVT_DLLPRIVATE void ImplFormat();
using Window::ImplHitTest;
- SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
+ SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev = true, bool bDrawNext = true);
SVT_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY,
sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear,
@@ -241,7 +233,7 @@ private:
SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate );
SVT_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld );
SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
- bool bMove, bool bExpand, bool bExtended );
+ bool bMove, bool bExpand, bool bExtended );
SVT_DLLPRIVATE void ImplUpdate( bool bCalcNew = false );
using Window::ImplScroll;
SVT_DLLPRIVATE void ImplScroll( bool bPrev );
@@ -343,9 +335,6 @@ method in CalendarField and create an own calendar there ourselves.
*************************************************************************/
-// - CalendarField -
-
-
class SVT_DLLPUBLIC CalendarField : public DateField
{
private:
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index 4fe31bfa1d8a..f24e79898eab 100644
--- a/include/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
@@ -26,10 +26,6 @@
namespace vcl { class Window; }
-
-// - ColorDialog -
-
-
namespace svtools
{
// SELECT is the default
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 0d5dc458a9d8..b2ccc9594659 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -175,18 +175,10 @@ class ImplHeadItem;
typedef ::std::vector< ImplHeadItem* > ImplHeadItemList;
-
-// - WinBits -
-
-
#define WB_BOTTOMBORDER ((WinBits)0x0400)
#define WB_BUTTONSTYLE ((WinBits)0x0800)
#define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER)
-
-// - HeaderBarItemBits -
-
-
enum class HeaderBarItemBits
{
NONE = 0x0000,
@@ -207,27 +199,21 @@ enum class HeaderBarItemBits
USERDRAW = 0x4000,
STDSTYLE = LEFT | LEFTIMAGE | VCENTER | CLICKABLE,
};
+
namespace o3tl
{
template<> struct typed_flags<HeaderBarItemBits> : is_typed_flags<HeaderBarItemBits, 0x7fff> {};
}
-
-// - HeaderBar-Types -
-
-
#define HEADERBAR_APPEND ((sal_uInt16)0xFFFF)
#define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF)
#define HEADERBAR_FULLSIZE ((long)1000000000)
#define HEADERBAR_TEXTOFF 2
-
-// - HeaderBar -
-
-
class VCLXHeaderBar;
+
class SVT_DLLPUBLIC HeaderBar : public vcl::Window
{
private:
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index bf281aa68a86..8025a01228fe 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -27,13 +27,9 @@
#include <unotools/options.hxx>
class SvtPrintOptions_Impl;
-
-
-// - SvtBasePrintOptions -
-
-
class PrinterOptions;
+
class SVT_DLLPUBLIC SvtBasePrintOptions: public utl::detail::Options
{
protected:
@@ -82,9 +78,6 @@ public:
};
-// - SvtPrinterOptions -
-
-
class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions
{
private:
@@ -99,9 +92,6 @@ public:
};
-// - SvtPrintFileOptions -
-
-
class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions
{
private:
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 384bc86b7a9b..007294e52656 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -34,9 +34,6 @@ class Printer;
class QueueInfo;
-// - PrinterSetupDialog -
-
-
class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog
{
private:
@@ -74,9 +71,6 @@ public:
};
-// - Helper functions for print dialog -
-
-
#define IMPL_PRINTDLG_STATUS_UPDATE 15000
void ImplFillPrnDlgListBox( const Printer* pPrinter,
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 33106c0b7a47..740e4427ff2f 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -456,13 +456,11 @@ Tips for the use of the ruler:
*************************************************************************/
-// - WinBits -
#define WB_EXTRAFIELD ((WinBits)0x00004000)
#define WB_RIGHT_ALIGNED ((WinBits)0x00008000)
#define WB_STDRULER WB_HORZ
-// - Ruler-Type -
enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE,
RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2,
@@ -483,11 +481,9 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW,
#define RULER_MOUSE_BORDERWIDTH 5
#define RULER_MOUSE_MARGINWIDTH 3
-// - RulerMargin -
#define RULER_MARGIN_SIZEABLE ((sal_uInt16)0x0001)
-// - RulerBorder -
#define RULER_BORDER_SIZEABLE ((sal_uInt16)0x0001)
#define RULER_BORDER_MOVEABLE ((sal_uInt16)0x0002)
@@ -505,7 +501,6 @@ struct RulerBorder
long nMaxPos;
};
-// - RulerIndent -
#define RULER_INDENT_TOP ((sal_uInt16)0x0000)
#define RULER_INDENT_BOTTOM ((sal_uInt16)0x0001)
@@ -518,7 +513,6 @@ struct RulerIndent
sal_uInt16 nStyle;
};
-// - RulerTab -
#define RULER_TAB_LEFT ((sal_uInt16)0x0000)
#define RULER_TAB_RIGHT ((sal_uInt16)0x0001)
@@ -535,15 +529,13 @@ struct RulerTab
};
-
-// - RulerLine -
-
struct RulerLine
{
long nPos;
sal_uInt16 nStyle;
};
+
struct RulerSelection
{
long nPos;
@@ -565,6 +557,7 @@ struct RulerSelection
{}
};
+
struct RulerUnitData
{
MapUnit eMapUnit; // MAP_UNIT for calculation
@@ -576,6 +569,7 @@ struct RulerUnitData
sal_Char aUnitStr[8]; // Unit string
};
+
// Data for drawing ruler tabstops
struct RulerTabData
{
@@ -597,7 +591,6 @@ struct RulerTabData
sal_uInt16 textoff;
};
-// - Ruler -
class ImplRulerData;
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index b0832842756e..05ba486195a9 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -27,10 +27,6 @@
class DataChangedEvent;
-
-// - ScrollableWindow-Type -
-
-
enum class ScrollableWindowFlags
{
THUMBDRAGGING = 1,
@@ -38,15 +34,13 @@ enum class ScrollableWindowFlags
HCENTER = 4,
DEFAULT = THUMBDRAGGING | VCENTER | HCENTER,
};
+
namespace o3tl
{
template<> struct typed_flags<ScrollableWindowFlags> : is_typed_flags<ScrollableWindowFlags, 0x07> {};
}
-// - ScrollableWindow -
-
-
class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window
{
private:
@@ -55,9 +49,9 @@ private:
long nLinePixH; // size of a line/column (pixel)
long nColumnPixW;
- VclPtr<ScrollBar> aVScroll; // the scrollbars
+ VclPtr<ScrollBar> aVScroll; // the scrollbars
VclPtr<ScrollBar> aHScroll;
- VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner
+ VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner
bool bScrolling:1, // user controlled scrolling
bHandleDragging:1, // scroll window while dragging
bHCenter:1,
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 678981feeb5c..aa2aef2cee27 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -262,9 +262,6 @@ been carried out.
class Button;
-// - WinBits -
-
-
#define WB_RANGESELECT ((WinBits)0x00200000)
#define WB_MULTISELECT ((WinBits)0x00400000)
#define WB_TOPBORDER ((WinBits)0x04000000)
@@ -273,19 +270,10 @@ class Button;
#define WB_INSERTTAB ((WinBits)0x40000000)
#define WB_STDTABBAR WB_BORDER
-
-// - TabBarPageBits -
-
-
typedef sal_uInt16 TabBarPageBits;
-
-// - Bits for TabBarPages -
-
-
#define TPB_SPECIAL ((TabBarPageBits)0x0001)
-
// - TabBar-Types - used in TabBar::AllowRenaming
enum TabBarAllowRenamingReturnCode {
@@ -294,9 +282,6 @@ enum TabBarAllowRenamingReturnCode {
TABBAR_RENAMING_CANCEL
};
-
-// - TabBar -
-
class MouseEvent;
class TrackingEvent;
class DataChangedEvent;
@@ -308,6 +293,7 @@ struct ImplTabBarItem;
struct TabBar_Impl;
typedef std::vector<ImplTabBarItem*> ImplTabBarList;
+
class SVT_DLLPUBLIC TabBar : public vcl::Window
{
friend class ImplTabButton;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 88da972ee0e8..93ab5891955f 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -179,7 +179,6 @@ to be set (before Show) with SetStyle().
typedef std::vector<ValueSetItem*> ValueItemList;
-// - ValueSet types -
#define WB_RADIOSEL ((WinBits)0x00008000)
#define WB_ITEMBORDER ((WinBits)0x00010000)
#define WB_DOUBLEBORDER ((WinBits)0x00020000)
@@ -189,10 +188,10 @@ typedef std::vector<ValueSetItem*> ValueItemList;
#define WB_NO_DIRECTSELECT ((WinBits)0x04000000)
#define WB_MENUSTYLEVALUESET ((WinBits)0x08000000)
-
#define VALUESET_APPEND ((size_t)-1)
#define VALUESET_ITEM_NOTFOUND ((size_t)-1)
+
class SVT_DLLPUBLIC ValueSet : public Control
{
private:
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index be3de098c17d..9ed4e2bbf949 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -182,17 +182,10 @@ IMPL_LINK_TYPED( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void )
*************************************************************************/
-
-// - WizardDialog-Types -
-
-
#define WIZARDDIALOG_BUTTON_STDOFFSET_X 6
#define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3
-// - WizardDialog -
-
-
class SVT_DLLPUBLIC WizardDialog : public ModalDialog
{
private:
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 5879e201edbd..562111aee892 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -28,12 +28,9 @@
#include <cstdio>
#include <vector>
-
-// - GalleryThemeEntry -
-
-
class SvStream;
+
class GalleryThemeEntry
{
private:
@@ -86,14 +83,11 @@ public:
typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList;
-
-// - Gallery -
-
-
class SfxListener;
class GalleryTheme;
class GalleryThemeCacheEntry;
+
class SVX_DLLPUBLIC Gallery : public SfxBroadcaster
{
// only for gengal utility!
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 6c18776e5431..c9e91ae32042 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -35,8 +35,6 @@
class SotStorage;
class SotStorageStream;
-// - SgaObjKind -
-
struct GalleryObject
{
@@ -52,6 +50,7 @@ struct GalleryObject
OUString maPath;
};
+
typedef ::std::vector< GalleryObject* > GalleryObjectList;
class GalleryThemeEntry;
@@ -59,17 +58,16 @@ class SgaObject;
class FmFormModel;
class ListBox;
-// - GalleryTheme -
-
-
class Gallery;
class GalleryProgress;
+
namespace unogallery
{
class GalleryTheme;
class GalleryItem;
}
+
class SVX_DLLPUBLIC GalleryTheme : public SfxBroadcaster
{
friend class Gallery;
@@ -82,7 +80,7 @@ private:
GalleryObjectList aObjectList;
OUString m_aDestDir;
bool m_bDestDirRelative;
- tools::SvRef<SotStorage> aSvDrawStorageRef;
+ tools::SvRef<SotStorage> aSvDrawStorageRef;
Gallery* pParent;
GalleryThemeEntry* pThm;
sal_uIntPtr mnThemeLockCount;
@@ -219,6 +217,6 @@ public:
SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme );
SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme );
-#endif
+#endif // INCLUDED_SVX_GALTHEME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index df22c2060061..679f15525753 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -26,9 +26,6 @@
#include <svx/svxdllapi.h>
-// - TbxImageItem -
-
-
class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
{
public:
@@ -39,9 +36,6 @@ public:
};
-// - SvxGrafToolBoxControl -
-
-
class SvxGrafToolBoxControl : public SfxToolBoxControl
{
public:
@@ -53,9 +47,6 @@ public:
};
-// - SvxGrafRedToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -64,9 +55,6 @@ public:
};
-// - SvxGrafGreenToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -75,9 +63,6 @@ public:
};
-// - SvxGrafBlueToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -86,9 +71,6 @@ public:
};
-// - SvxGrafLuminanceToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -97,9 +79,6 @@ public:
};
-// - SvxGrafContrastToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -108,9 +87,6 @@ public:
};
-// - SvxGrafGammaToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -119,9 +95,6 @@ public:
};
-// - SvxGrafTransparenceToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxControl
{
public:
@@ -130,9 +103,6 @@ public:
};
-// - SvxGrafModeToolBoxControl -
-
-
class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public SfxListener
{
public:
@@ -145,12 +115,10 @@ public:
};
-// - SvxGrafAttrHelper -
-
-
class SdrView;
class SfxRequest;
+
class SVX_DLLPUBLIC SvxGrafAttrHelper
{
public:
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index d4f132beb7eb..4e2f1e0bb39c 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -98,58 +98,61 @@ enum DFF_TextHeader {
// 1" = 12700*72 = 914400 EMU
// 1" = 25.4mm
// 1mm = 36000 EMU
+
+
+// Record Name FBT-Value Instance Contents Wrd Exl Ppt Ver
// Transform
#define DFF_Prop_Rotation 4 // Fixed Point 16.16 degrees
// Protection
#define DFF_Prop_LockAgainstGrouping 127 // sal_Bool Do not group this shape
// Text
-#define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host
-#define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs)
+#define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host
+#define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs)
#define DFF_Prop_dyTextTop 130 // LONG
#define DFF_Prop_dxTextRight 131 // LONG
#define DFF_Prop_dyTextBottom 132 // LONG
-#define DFF_Prop_WrapText 133 // MSO_WRAPMODE Wrap text at shape margins
-#define DFF_Prop_anchorText 135 // MSO_ANCHOR How to anchor the text
-#define DFF_Prop_txflTextFlow 136 // MSO_TXFL Text flow
-#define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation
-#define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes)
+#define DFF_Prop_WrapText 133 // MSO_WRAPMODE Wrap text at shape margins
+#define DFF_Prop_anchorText 135 // MSO_ANCHOR How to anchor the text
+#define DFF_Prop_txflTextFlow 136 // MSO_TXFL Text flow
+#define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation
+#define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes)
#define DFF_Prop_AutoTextMargin 188 // sal_Bool use host's margin calculations
#define DFF_Prop_RotateText 189 // sal_Bool Rotate text with shape
#define DFF_Prop_FitTextToShape 191 // sal_Bool Size text to fit shape size
// GeoText
-#define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string
-#define DFF_Prop_gtextAlign 194 // MSO_GEOTEXTALIGN alignment on curve
-#define DFF_Prop_gtextSize 195 // LONG default point size
-#define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16
-#define DFF_Prop_gtextFont 197 // WCHAR* font family name
+#define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string
+#define DFF_Prop_gtextAlign 194 // MSO_GEOTEXTALIGN alignment on curve
+#define DFF_Prop_gtextSize 195 // LONG default point size
+#define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16
+#define DFF_Prop_gtextFont 197 // WCHAR* font family name
#define DFF_Prop_gtextFStretch 245 // sal_Bool 400 Stretch to fit shape
#define DFF_Prop_gtextFBold 250 // sal_Bool 20 Bold font
#define DFF_Prop_gtextFItalic 251 // sal_Bool 10 Italic font
#define DFF_Prop_gtextFStrikethrough 255 // sal_Bool 1 Strike through font
// Blip
-#define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate.
+#define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate.
#define DFF_Prop_cropFromBottom 257 // LONG
#define DFF_Prop_cropFromLeft 258 // LONG
#define DFF_Prop_cropFromRight 259 // LONG
-#define DFF_Prop_pib 260 // IMsoBlip* Blip to display
-#define DFF_Prop_pibName 261 // WCHAR* Blip file name
-#define DFF_Prop_pibFlags 262 // MSO_BLIPFLAGS Blip flags
-#define DFF_Prop_pictureTransparent 263 // LONG transparent color (none if ~0UL)
-#define DFF_Prop_pictureContrast 264 // LONG contrast setting
-#define DFF_Prop_pictureBrightness 265 // LONG brightness setting
-#define DFF_Prop_pictureGamma 266 // LONG 16.16 gamma
-#define DFF_Prop_pictureId 267 // LONG Host-defined ID for OLE objects (usually a pointer)
+#define DFF_Prop_pib 260 // IMsoBlip* Blip to display
+#define DFF_Prop_pibName 261 // WCHAR* Blip file name
+#define DFF_Prop_pibFlags 262 // MSO_BLIPFLAGS Blip flags
+#define DFF_Prop_pictureTransparent 263 // LONG transparent color (none if ~0UL)
+#define DFF_Prop_pictureContrast 264 // LONG contrast setting
+#define DFF_Prop_pictureBrightness 265 // LONG brightness setting
+#define DFF_Prop_pictureGamma 266 // LONG 16.16 gamma
+#define DFF_Prop_pictureId 267 // LONG Host-defined ID for OLE objects (usually a pointer)
#define DFF_Prop_pictureActive 319 // sal_Bool Server is active (OLE objects only)
// Geometry
-#define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space.
+#define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space.
#define DFF_Prop_geoTop 321 // LONG
#define DFF_Prop_geoRight 322 // LONG
#define DFF_Prop_geoBottom 323 // LONG
-#define DFF_Prop_pVertices 325 // IMsoArray An array of points, in G units.
+#define DFF_Prop_pVertices 325 // IMsoArray An array of points, in G units.
#define DFF_Prop_pSegmentInfo 326 // IMsoArray
-#define DFF_Prop_adjustValue 327 // LONG Adjustment values corresponding to the positions of the
-#define DFF_Prop_adjust2Value 328 // LONG adjust handles of the shape. The number of values used
-#define DFF_Prop_adjust3Value 329 // LONG and their allowable ranges vary from shape type to shape type.
+#define DFF_Prop_adjustValue 327 // LONG Adjustment values corresponding to the positions of the
+#define DFF_Prop_adjust2Value 328 // LONG adjust handles of the shape. The number of values used
+#define DFF_Prop_adjust3Value 329 // LONG and their allowable ranges vary from shape type to shape type.
#define DFF_Prop_adjust4Value 330 // LONG
#define DFF_Prop_adjust5Value 331 // LONG
#define DFF_Prop_adjust6Value 332 // LONG
@@ -163,112 +166,112 @@ enum DFF_TextHeader {
#define DFF_Prop_Handles 341 // H*
#define DFF_Prop_pFormulas 342 // LONG
#define DFF_Prop_textRectangles 343 // LONG
-#define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect
+#define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect
#define DFF_Prop_f3DOK 379 // sal_Bool 3D may be set
#define DFF_Prop_fGtextOK 381 // sal_Bool Text effect (FontWork) supported
#define DFF_Prop_fFillShadeShapeOK 382 // BOOL
#define DFF_Prop_fFillOK 383 // sal_Bool OK to fill the shape through the UI or VBA?
// FillStyle
-#define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill
-#define DFF_Prop_fillColor 385 // MSO_CLR Foreground color
-#define DFF_Prop_fillOpacity 386 // LONG Fixed 16.16
-#define DFF_Prop_fillBackColor 387 // MSO_CLR Background color
-#define DFF_Prop_fillBackOpacity 388 // LONG Shades only
-#define DFF_Prop_fillBlip 390 // IMsoBlip* Pattern/texture
-#define DFF_Prop_fillWidth 393 // LONG How big (A units) to make a metafile texture.
+#define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill
+#define DFF_Prop_fillColor 385 // MSO_CLR Foreground color
+#define DFF_Prop_fillOpacity 386 // LONG Fixed 16.16
+#define DFF_Prop_fillBackColor 387 // MSO_CLR Background color
+#define DFF_Prop_fillBackOpacity 388 // LONG Shades only
+#define DFF_Prop_fillBlip 390 // IMsoBlip* Pattern/texture
+#define DFF_Prop_fillWidth 393 // LONG How big (A units) to make a metafile texture.
#define DFF_Prop_fillHeight 394 // LONG
-#define DFF_Prop_fillAngle 395 // LONG Fade angle - degrees in 16.16
-#define DFF_Prop_fillFocus 396 // LONG Linear shaded fill focus percent
-#define DFF_Prop_fillToRight 399 // LONG Fraction 16.16
-#define DFF_Prop_fillToBottom 400 // LONG Fraction 16.16
-#define DFF_Prop_fillShadeColors 407 // IMsoArray a preset array of colors
+#define DFF_Prop_fillAngle 395 // LONG Fade angle - degrees in 16.16
+#define DFF_Prop_fillFocus 396 // LONG Linear shaded fill focus percent
+#define DFF_Prop_fillToRight 399 // LONG Fraction 16.16
+#define DFF_Prop_fillToBottom 400 // LONG Fraction 16.16
+#define DFF_Prop_fillShadeColors 407 // IMsoArray a preset array of colors
#define DFF_Prop_fFilled 443 // sal_Bool Is shape filled?
#define DFF_Prop_fNoFillHitTest 447 // sal_Bool Hit test a shape as though filled
// LineStyle
-#define DFF_Prop_lineColor 448 // MSO_CLR Color of line
-#define DFF_Prop_lineOpacity 449 // LONG Not implemented
-#define DFF_Prop_lineBackColor 450 // MSO_CLR Background color
-#define DFF_Prop_lineWidth 459 // LONG A units; 1pt == 12700 EMUs
-#define DFF_Prop_lineStyle 461 // MSO_LINESTYLE Draw parallel lines?
-#define DFF_Prop_lineDashing 462 // MSO_LINEDASHING Can be overridden by:
-#define DFF_Prop_lineDashStyle 463 // IMsoArray As Win32 ExtCreatePen
-#define DFF_Prop_lineStartArrowhead 464 // MSO_LINEEND Arrow at start
-#define DFF_Prop_lineEndArrowhead 465 // MSO_LINEEND Arrow at end
-#define DFF_Prop_lineStartArrowWidth 466 // MSO_LINEENDWIDTH Arrow at start
-#define DFF_Prop_lineStartArrowLength 467 // MSO_LINEENDLENGTH Arrow at end
-#define DFF_Prop_lineEndArrowWidth 468 // MSO_LINEENDWIDTH Arrow at start
-#define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end
-#define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines
-#define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines
+#define DFF_Prop_lineColor 448 // MSO_CLR Color of line
+#define DFF_Prop_lineOpacity 449 // LONG Not implemented
+#define DFF_Prop_lineBackColor 450 // MSO_CLR Background color
+#define DFF_Prop_lineWidth 459 // LONG A units; 1pt == 12700 EMUs
+#define DFF_Prop_lineStyle 461 // MSO_LINESTYLE Draw parallel lines?
+#define DFF_Prop_lineDashing 462 // MSO_LINEDASHING Can be overridden by:
+#define DFF_Prop_lineDashStyle 463 // IMsoArray As Win32 ExtCreatePen
+#define DFF_Prop_lineStartArrowhead 464 // MSO_LINEEND Arrow at start
+#define DFF_Prop_lineEndArrowhead 465 // MSO_LINEEND Arrow at end
+#define DFF_Prop_lineStartArrowWidth 466 // MSO_LINEENDWIDTH Arrow at start
+#define DFF_Prop_lineStartArrowLength 467 // MSO_LINEENDLENGTH Arrow at end
+#define DFF_Prop_lineEndArrowWidth 468 // MSO_LINEENDWIDTH Arrow at start
+#define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end
+#define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines
+#define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines
#define DFF_Prop_fLine 508 // sal_Bool Any line?
#define DFF_Prop_fNoLineDrawDash 511 // sal_Bool Draw a dashed line if no line
// ShadowStyle
-#define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect
-#define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color
-#define DFF_Prop_shadowOpacity 516 // LONG Fixed 16.16
-#define DFF_Prop_shadowOffsetX 517 // LONG Offset shadow
-#define DFF_Prop_shadowOffsetY 518 // LONG Offset shadow
+#define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect
+#define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color
+#define DFF_Prop_shadowOpacity 516 // LONG Fixed 16.16
+#define DFF_Prop_shadowOffsetX 517 // LONG Offset shadow
+#define DFF_Prop_shadowOffsetY 518 // LONG Offset shadow
#define DFF_Prop_fshadowObscured 575 // sal_Bool Excel5-style shadow
// PerspectiveStyle
#define DFF_Prop_fPerspective 639 // sal_Bool On/off
// 3D Object
-#define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16
-#define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16
-#define DFF_Prop_c3DShininess 642 // LONG Default gives OK results
-#define DFF_Prop_c3DExtrudeForward 644 // LONG Distance of extrusion in EMUs
+#define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16
+#define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16
+#define DFF_Prop_c3DShininess 642 // LONG Default gives OK results
+#define DFF_Prop_c3DExtrudeForward 644 // LONG Distance of extrusion in EMUs
#define DFF_Prop_c3DExtrudeBackward 645 // LONG
-#define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
+#define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
#define DFF_Prop_fc3DLightFace 703 // BOOL
// 3D Style
-#define DFF_Prop_c3DYRotationAngle 704 // LONG degrees (16.16) about y axis
-#define DFF_Prop_c3DXRotationAngle 705 // LONG degrees (16.16) about x axis
-#define DFF_Prop_c3DRotationCenterX 710 // LONG rotation center x (16.16 or g-units)
-#define DFF_Prop_c3DRotationCenterY 711 // LONG rotation center y (16.16 or g-units)
-#define DFF_Prop_c3DRotationCenterZ 712 // LONG rotation center z (absolute (emus))
-#define DFF_Prop_c3DRenderMode 713 // MSO_3DRENDERMODE Full,wireframe, or bcube
-#define DFF_Prop_c3DTolerance 714 // LONG pixels (16.16)
-#define DFF_Prop_c3DXViewpoint 715 // LONG X view point (emus)
-#define DFF_Prop_c3DYViewpoint 716 // LONG Y view point (emus)
-#define DFF_Prop_c3DZViewpoint 717 // LONG Z view distance (emus)
+#define DFF_Prop_c3DYRotationAngle 704 // LONG degrees (16.16) about y axis
+#define DFF_Prop_c3DXRotationAngle 705 // LONG degrees (16.16) about x axis
+#define DFF_Prop_c3DRotationCenterX 710 // LONG rotation center x (16.16 or g-units)
+#define DFF_Prop_c3DRotationCenterY 711 // LONG rotation center y (16.16 or g-units)
+#define DFF_Prop_c3DRotationCenterZ 712 // LONG rotation center z (absolute (emus))
+#define DFF_Prop_c3DRenderMode 713 // MSO_3DRENDERMODE Full,wireframe, or bcube
+#define DFF_Prop_c3DTolerance 714 // LONG pixels (16.16)
+#define DFF_Prop_c3DXViewpoint 715 // LONG X view point (emus)
+#define DFF_Prop_c3DYViewpoint 716 // LONG Y view point (emus)
+#define DFF_Prop_c3DZViewpoint 717 // LONG Z view distance (emus)
#define DFF_Prop_c3DOriginX 718 // LONG
#define DFF_Prop_c3DOriginY 719 // LONG
-#define DFF_Prop_c3DSkewAngle 720 // LONG degree (16.16) skew angle
-#define DFF_Prop_c3DSkewAmount 721 // LONG Percentage skew amount
-#define DFF_Prop_c3DAmbientIntensity 722 // LONG Fixed point intensity
-#define DFF_Prop_c3DKeyX 723 // LONG Key light source direc-
-#define DFF_Prop_c3DKeyY 724 // LONG tion; only their relative
-#define DFF_Prop_c3DKeyZ 725 // LONG magnitudes matter
-#define DFF_Prop_c3DKeyIntensity 726 // LONG Fixed point intensity
-#define DFF_Prop_c3DFillX 727 // LONG Fill light source direc-
-#define DFF_Prop_c3DFillY 728 // LONG tion; only their relative
-#define DFF_Prop_c3DFillZ 729 // LONG magnitudes matter
-#define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity
-#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh?
+#define DFF_Prop_c3DSkewAngle 720 // LONG degree (16.16) skew angle
+#define DFF_Prop_c3DSkewAmount 721 // LONG Percentage skew amount
+#define DFF_Prop_c3DAmbientIntensity 722 // LONG Fixed point intensity
+#define DFF_Prop_c3DKeyX 723 // LONG Key light source direc-
+#define DFF_Prop_c3DKeyY 724 // LONG tion; only their relative
+#define DFF_Prop_c3DKeyZ 725 // LONG magnitudes matter
+#define DFF_Prop_c3DKeyIntensity 726 // LONG Fixed point intensity
+#define DFF_Prop_c3DFillX 727 // LONG Fill light source direc-
+#define DFF_Prop_c3DFillY 728 // LONG tion; only their relative
+#define DFF_Prop_c3DFillZ 729 // LONG magnitudes matter
+#define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity
+#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh?
// Shape
-#define DFF_Prop_hspMaster 769 // MSO_HSP master shape
-#define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector
-#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape.
+#define DFF_Prop_hspMaster 769 // MSO_HSP master shape
+#define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector
+#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape.
// Callout
-#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified
+#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified
// GroupShape
-#define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set)
-#define DFF_Prop_wzDescription 897 // WCHAR* alternate text
-#define DFF_Prop_pihlShape 898 // IHlink* The hyperlink in the shape.
-#define DFF_Prop_pWrapPolygonVertices 899 // IMsoArray The polygon that text will be wrapped around (Word)
-#define DFF_Prop_dxWrapDistLeft 900 // LONG Left wrapping distance from text (Word)
-#define DFF_Prop_dyWrapDistTop 901 // LONG Top wrapping distance from text (Word)
-#define DFF_Prop_dxWrapDistRight 902 // LONG Right wrapping distance from text (Word)
-#define DFF_Prop_dyWrapDistBottom 903 // LONG Bottom wrapping distance from text (Word)
+#define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set)
+#define DFF_Prop_wzDescription 897 // WCHAR* alternate text
+#define DFF_Prop_pihlShape 898 // IHlink* The hyperlink in the shape.
+#define DFF_Prop_pWrapPolygonVertices 899 // IMsoArray The polygon that text will be wrapped around (Word)
+#define DFF_Prop_dxWrapDistLeft 900 // LONG Left wrapping distance from text (Word)
+#define DFF_Prop_dyWrapDistTop 901 // LONG Top wrapping distance from text (Word)
+#define DFF_Prop_dxWrapDistRight 902 // LONG Right wrapping distance from text (Word)
+#define DFF_Prop_dyWrapDistBottom 903 // LONG Bottom wrapping distance from text (Word)
#define DFF_Prop_tableProperties 927 // LONG
#define DFF_Prop_tableRowProperties 928 // LONG*
-#define DFF_Prop_fHidden 958 // sal_Bool Do not display
-#define DFF_Prop_fPrint 959 // sal_Bool Print this shape
+#define DFF_Prop_fHidden 958 // sal_Bool Do not display
+#define DFF_Prop_fPrint 959 // sal_Bool Print this shape
// entsprechende BitFlags
// properties of the second property set
-#define DFF_Prop_metroBlob 937 // XML ZipPackage*
+#define DFF_Prop_metroBlob 937 // XML ZipPackage*
// linchpin: the shape type
enum MSO_SPT: sal_Int32 {
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 307c4d0b3fdf..9ea8d917d521 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -29,9 +29,6 @@ class Graphic;
namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } }
-// - SdrMediaObj -
-
-
class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj
{
friend class sdr::contact::ViewContactOfSdrMediaObj;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index cc496a347bd8..3b4226503d39 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -29,30 +29,21 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <svx/svxdllapi.h>
-
-// - SvXMLEmbeddedObjectHelper -
-
-
enum SvXMLEmbeddedObjectHelperMode
{
EMBEDDEDOBJECTHELPER_MODE_READ = 0,
EMBEDDEDOBJECTHELPER_MODE_WRITE = 1
};
+namespace comphelper { class IEmbeddedHelper; }
-// - SvXMLEmbeddedObjectHelper -
-
-
-namespace comphelper {
-class IEmbeddedHelper;
-}
class SvGlobalName;
struct OUStringLess;
class OutputStorageWrapper_Impl;
-class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper2<
- css::document::XEmbeddedObjectResolver,
- css::container::XNameAccess >
+
+class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper :
+ public ::cppu::WeakComponentImplHelper2< css::document::XEmbeddedObjectResolver, css::container::XNameAccess >
{
typedef ::std::map< OUString, OutputStorageWrapper_Impl*,
OUStringLess > SvXMLEmbeddedObjectHelper_Impl;
@@ -141,6 +132,6 @@ public:
OUString& rObjectStorageName);
};
-#endif
+#endif // INCLUDED_SVX_XMLEOHLP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/util/xreplaceable.hxx b/include/test/util/xreplaceable.hxx
index 37caf17393e0..9f33feeb5d9d 100644
--- a/include/test/util/xreplaceable.hxx
+++ b/include/test/util/xreplaceable.hxx
@@ -22,8 +22,8 @@ public:
maSearchString(rSearchString), maReplaceString(rReplaceString) {}
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
- void testCreateReplaceDescriptor();
- void testReplaceAll();
+ void testCreateReplaceDescriptor();
+ void testReplaceAll();
protected:
~XReplaceable() {}
diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index a5e137c2d0c4..388796bb20e1 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -48,9 +48,9 @@ public:
virtual ~BootstrapFixtureBase();
css::uno::Reference<css::uno::XComponentContext>
- getComponentContext() { return m_xContext; }
+ getComponentContext() { return m_xContext; }
css::uno::Reference<css::lang::XMultiServiceFactory>
- getMultiServiceFactory() { return m_xSFactory; }
+ getMultiServiceFactory() { return m_xSFactory; }
OUString getSrcRootURL() { return m_aSrcRootURL; }
OUString getSrcRootPath() { return m_aSrcRootPath; }
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 567be3b60b5d..d8080734ea5e 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -25,7 +25,6 @@
#include <tools/solar.h>
#include <o3tl/typed_flags_set.hxx>
-// - FontToSubsFont -
enum class FontToSubsFontFlags
{
@@ -44,26 +43,26 @@ UNOTOOLS_DLLPUBLIC void DestroyFontToSubsFontConverter( F
UNOTOOLS_DLLPUBLIC sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
UNOTOOLS_DLLPUBLIC OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter );
-// - StarSymbolToMSMultiFont -
class UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont
{
public:
- //Returns the name of the best windows symbol font which this char can be
- //mapped to. Sets rChar to the correct position for that font. If no
- //match found, then no name is returned, and rChar is unchanged. If you
- //want to convert a string, you don't want to use this.
+ // Returns the name of the best windows symbol font which this char can be
+ // mapped to. Sets rChar to the correct position for that font. If no
+ // match found, then no name is returned, and rChar is unchanged. If you
+ // want to convert a string, you don't want to use this.
virtual OUString ConvertChar(sal_Unicode &rChar) = 0;
virtual ~StarSymbolToMSMultiFont() {}
};
-//with bPerfect set the converter will only try and convert symbols which have
-//perfect mappings to the windows symbols fonts. With it not set, it will
-//allow somewhat more dubious transformations that are nevertheless
-//recognizably similar. Even in this mode there will be characters that fail.
-//The users of this might want to make a distinction between failed characters
-//which were inside and those outside the unicode private area.
+
+// with bPerfect set the converter will only try and convert symbols which have
+// perfect mappings to the windows symbols fonts. With it not set, it will
+// allow somewhat more dubious transformations that are nevertheless
+// recognizably similar. Even in this mode there will be characters that fail.
+// The users of this might want to make a distinction between failed characters
+// which were inside and those outside the unicode private area.
UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
#endif // INCLUDED_UNOTOOLS_FONTCVT_HXX
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 37d78cefd45a..3f86b37a16e6 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -31,8 +31,6 @@ namespace utl {
struct FontNameAttr;
}
-// - SubsFontName -
-
enum class SubsFontFlags
{
ONLYONE = 0x01,
@@ -40,6 +38,7 @@ enum class SubsFontFlags
PS = 0x04,
HTML = 0x08,
};
+
namespace o3tl
{
template<> struct typed_flags<SubsFontFlags> : is_typed_flags<SubsFontFlags, 0x0f> {};
@@ -49,7 +48,6 @@ UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, SubsFontFlag
UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewToken );
-// - ConvertChar -
class UNOTOOLS_DLLPUBLIC ConvertChar
{
@@ -62,7 +60,7 @@ public:
static const ConvertChar* GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName );
};
-// Default-Font
+
enum class DefaultFontType
{
SANS_UNICODE = 1,
@@ -91,7 +89,6 @@ enum class DefaultFontType
};
UNOTOOLS_DLLPUBLIC OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex );
-
UNOTOOLS_DLLPUBLIC OUString GetEnglishSearchFontName( const OUString& rName );
/** Strip any "script font suffix" from the font name
@@ -113,6 +110,6 @@ UNOTOOLS_DLLPUBLIC OUString StripScriptFromName(const OUString& rName);
// FIXME It's quite possible that code using this should instead check for RTL_TEXTENCODING_SYMBOL.
UNOTOOLS_DLLPUBLIC bool IsStarSymbol(const OUString &rFontName);
-#endif
+#endif // INCLUDED_UNOTOOLS_FONTDEFS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 4e9c44f81578..051beb8a2b13 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -25,11 +25,10 @@
#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
-// - Access functions -
typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask);
typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
-// - BitmapInfoAccess -
+
class VCL_DLLPUBLIC BitmapInfoAccess
{
friend class BitmapReadAccess;
@@ -86,7 +85,7 @@ protected:
BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
};
-// - BitmapReadAccess -
+
class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess
{
friend class BitmapWriteAccess;
@@ -181,7 +180,7 @@ protected:
BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
};
-// - BitmapWriteAccess -
+
class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
{
public:
@@ -233,22 +232,25 @@ private:
}
};
-// - Inlines -
+
inline bool BitmapInfoAccess::operator!() const
{
return mpBuffer == nullptr;
}
+
inline long BitmapInfoAccess::Width() const
{
return mpBuffer ? mpBuffer->mnWidth : 0L;
}
+
inline long BitmapInfoAccess::Height() const
{
return mpBuffer ? mpBuffer->mnHeight : 0L;
}
+
inline bool BitmapInfoAccess::IsTopDown() const
{
assert(mpBuffer && "Access is not valid!");
@@ -256,11 +258,13 @@ inline bool BitmapInfoAccess::IsTopDown() const
return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN);
}
+
inline bool BitmapInfoAccess::IsBottomUp() const
{
return !IsTopDown();
}
+
inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
{
assert(mpBuffer && "Access is not valid!");
@@ -268,6 +272,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL;
}
+
inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
{
assert(mpBuffer && "Access is not valid!");
@@ -275,6 +280,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
return mpBuffer ? mpBuffer->mnScanlineSize : 0UL;
}
+
inline sal_uInt16 BitmapInfoAccess::GetBitCount() const
{
assert(mpBuffer && "Access is not valid!");
@@ -282,6 +288,7 @@ inline sal_uInt16 BitmapInfoAccess::GetBitCount() const
return mpBuffer ? mpBuffer->mnBitCount : 0;
}
+
inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor)
{
if (HasPalette())
@@ -290,6 +297,7 @@ inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBi
return rBitmapColor;
}
+
inline bool BitmapInfoAccess::HasPalette() const
{
assert(mpBuffer && "Access is not valid!");
@@ -297,6 +305,7 @@ inline bool BitmapInfoAccess::HasPalette() const
return mpBuffer && !!mpBuffer->maPalette;
}
+
inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
{
assert(mpBuffer && "Access is not valid!");
@@ -304,6 +313,7 @@ inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
return mpBuffer->maPalette;
}
+
inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
{
assert(HasPalette() && "Bitmap has no palette!");
@@ -311,6 +321,7 @@ inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0;
}
+
inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const
{
assert(mpBuffer && "Access is not valid!");
@@ -319,13 +330,13 @@ inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor )
return mpBuffer->maPalette[nColor];
}
+
inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const
{
return GetPaletteColor(GetBestPaletteIndex(rBitmapColor));
}
-
inline ColorMask& BitmapInfoAccess::GetColorMask() const
{
assert(mpBuffer && "Access is not valid!");
@@ -333,6 +344,7 @@ inline ColorMask& BitmapInfoAccess::GetColorMask() const
return mpBuffer->maColorMask;
}
+
inline Scanline BitmapReadAccess::GetBuffer() const
{
assert(mpBuffer && "Access is not valid!");
@@ -340,6 +352,7 @@ inline Scanline BitmapReadAccess::GetBuffer() const
return mpBuffer ? mpBuffer->mpBits : nullptr;
}
+
inline Scanline BitmapReadAccess::GetScanline(long nY) const
{
assert(mpBuffer && mpScanBuf && "Access is not valid!");
@@ -348,6 +361,7 @@ inline Scanline BitmapReadAccess::GetScanline(long nY) const
return mpScanBuf[nY];
}
+
inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
{
assert(mpBuffer && mpScanBuf && "Access is not valid!");
@@ -357,11 +371,13 @@ inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
return mFncGetPixel(mpScanBuf[nY], nX, maColorMask );
}
+
inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const
{
return GetPixel(nY, nX).GetBlueOrIndex();
}
+
inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const
{
assert(pData && "Access is not valid!");
@@ -369,6 +385,7 @@ inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, lo
return mFncGetPixel( pData, nX, maColorMask );
}
+
inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor)
{
assert(pData && "Access is not valid!");
@@ -376,6 +393,7 @@ inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const Bi
mFncSetPixel(pData, nX, rBitmapColor, maColorMask);
}
+
inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
{
if (HasPalette())
@@ -384,11 +402,13 @@ inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
return GetPixel(nY, nX);
}
+
inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const
{
return GetColor(nY, nX).GetLuminance();
}
+
inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
{
assert(mpBuffer && "Access is not valid!");
@@ -396,6 +416,7 @@ inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
mpBuffer->maPalette = rPalette;
}
+
inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
{
assert(mpBuffer && "Access is not valid!");
@@ -403,6 +424,7 @@ inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
mpBuffer->maPalette.SetEntryCount(nCount);
}
+
inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
{
assert(mpBuffer && "Access is not valid!");
@@ -411,6 +433,7 @@ inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapCo
mpBuffer->maPalette[nColor] = rBitmapColor;
}
+
inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor)
{
assert(mpBuffer && "Access is not valid!");
@@ -420,6 +443,7 @@ inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBi
mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask);
}
+
inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
{
SetPixel(nY, nX, BitmapColor(cIndex));
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 9665dfd10ea1..2cea4564235c 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -37,6 +37,7 @@ class UserDrawEvent;
class ImplCommonButtonData;
enum class DrawButtonFlags;
+
class VCL_DLLPUBLIC Button : public Control
{
private:
@@ -103,9 +104,6 @@ protected:
};
-// - PushButton-Types -
-
-
enum class PushButtonDropdownStyle
{
NONE = 0x0000,
@@ -114,9 +112,6 @@ enum class PushButtonDropdownStyle
};
-// - PushButton -
-
-
class VCL_DLLPUBLIC PushButton : public Button
{
protected:
@@ -207,16 +202,19 @@ public:
virtual void ShowFocus(const Rectangle& rRect) override;
};
+
inline void PushButton::Check( bool bCheck )
{
SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE );
}
+
inline bool PushButton::IsChecked() const
{
return (GetState() == TRISTATE_TRUE);
}
+
class VCL_DLLPUBLIC OKButton : public PushButton
{
protected:
@@ -233,6 +231,7 @@ public:
virtual void Click() override;
};
+
class VCL_DLLPUBLIC CancelButton : public PushButton
{
protected:
@@ -249,6 +248,7 @@ public:
virtual void Click() override;
};
+
class VCL_DLLPUBLIC CloseButton : public CancelButton
{
public:
@@ -256,10 +256,6 @@ public:
};
-
-// - HelpButton -
-
-
class VCL_DLLPUBLIC HelpButton : public PushButton
{
protected:
@@ -277,7 +273,6 @@ public:
};
-// - RadioButton -
class VCL_DLLPUBLIC RadioButton : public Button
{
private:
@@ -404,9 +399,6 @@ public:
};
-// - CheckBox -
-
-
class VCL_DLLPUBLIC CheckBox : public Button
{
private:
@@ -495,24 +487,24 @@ public:
virtual void ShowFocus(const Rectangle& rRect) override;
};
+
inline void CheckBox::Check( bool bCheck )
{
SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE );
}
+
inline bool CheckBox::IsChecked() const
{
return (GetState() == TRISTATE_TRUE);
}
-// - Control-Layer fuer alten Code -
-
-
class VCL_DLLPUBLIC ImageButton : public PushButton
{
protected:
using PushButton::ImplInitStyle;
+
private:
SAL_DLLPRIVATE void ImplInitStyle();
@@ -524,6 +516,7 @@ public:
ImageButton( vcl::Window* pParent, const ResId& rResId );
};
+
class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
{
ImageRadioButton( const ImageRadioButton & ) = delete;
@@ -533,6 +526,7 @@ public:
explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
};
+
class VCL_DLLPUBLIC TriStateBox : public CheckBox
{
TriStateBox( const TriStateBox & ) = delete;
@@ -542,10 +536,12 @@ public:
explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
};
+
class VCL_DLLPUBLIC DisclosureButton : public CheckBox
{
protected:
SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override;
+
public:
explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index bba39cc97ddd..d3ec4ffc9435 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -26,10 +26,6 @@
#include <vcl/keycod.hxx>
#include <vcl/font.hxx>
-
-// - CommandExtTextInputData -
-
-
#define EXTTEXTINPUT_ATTR_GRAYWAVELINE ((sal_uInt16)0x0100)
#define EXTTEXTINPUT_ATTR_UNDERLINE ((sal_uInt16)0x0200)
#define EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((sal_uInt16)0x0400)
@@ -42,6 +38,7 @@
#define EXTTEXTINPUT_CURSOR_INVISIBLE ((sal_uInt16)0x0001)
#define EXTTEXTINPUT_CURSOR_OVERWRITE ((sal_uInt16)0x0002)
+
class VCL_DLLPUBLIC CommandExtTextInputData
{
private:
@@ -70,9 +67,6 @@ public:
};
-// - CommandInputContextData -
-
-
class VCL_DLLPUBLIC CommandInputContextData
{
private:
@@ -83,20 +77,19 @@ public:
CommandInputContextData( LanguageType eLang );
};
+
inline CommandInputContextData::CommandInputContextData()
{
meLanguage = LANGUAGE_DONTKNOW;
}
+
inline CommandInputContextData::CommandInputContextData( LanguageType eLang )
{
meLanguage = eLang;
}
-// - CommandWheelData -
-
-
enum class CommandWheelMode
{
NONE = 0,
@@ -106,6 +99,7 @@ enum class CommandWheelMode
DATAZOOM = 4
};
+
// Magic value used in mnLines field in CommandWheelData
#define COMMAND_WHEEL_PAGESCROLL ((sal_uLong)0xFFFFFFFF)
@@ -145,6 +139,7 @@ public:
{ return ((mnCode & KEY_MOD2) != 0); }
};
+
inline CommandWheelData::CommandWheelData()
{
mnDelta = 0;
@@ -156,6 +151,7 @@ inline CommandWheelData::CommandWheelData()
mbDeltaIsPixel = false;
}
+
inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
sal_uLong nScrollLines,
CommandWheelMode nWheelMode, sal_uInt16 nKeyModifier,
@@ -171,9 +167,6 @@ inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDel
}
-// - CommandScrollData -
-
-
class VCL_DLLPUBLIC CommandScrollData
{
private:
@@ -188,12 +181,14 @@ public:
long GetDeltaY() const { return mnDeltaY; }
};
+
inline CommandScrollData::CommandScrollData()
{
mnDeltaX = 0;
mnDeltaY = 0;
}
+
inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
{
mnDeltaX = nDeltaX;
@@ -201,9 +196,6 @@ inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
}
-// - CommandModKeyData -
-
-
class VCL_DLLPUBLIC CommandModKeyData
{
private:
@@ -219,26 +211,26 @@ public:
bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) != 0; }
};
+
inline CommandModKeyData::CommandModKeyData()
{
mnCode = 0L;
}
+
inline CommandModKeyData::CommandModKeyData( sal_uInt16 nCode )
{
mnCode = nCode;
}
-// - CommandDialogData -
-
-
enum class ShowDialogId
{
Preferences = 1,
About = 2,
};
+
class VCL_DLLPUBLIC CommandDialogData
{
ShowDialogId m_nDialogId;
@@ -250,6 +242,7 @@ public:
ShowDialogId GetDialogId() const { return m_nDialogId; }
};
+
// Media Commands
enum class MediaCommand
{
@@ -277,6 +270,7 @@ enum class MediaCommand
PreviousTrackHold = 22,// Button Left holding pressed.
};
+
class VCL_DLLPUBLIC CommandMediaData
{
MediaCommand m_nMediaId;
@@ -292,7 +286,7 @@ public:
bool GetPassThroughToOS() const { return m_bPassThroughToOS; }
};
-// - CommandSelectionChangeData -
+
class VCL_DLLPUBLIC CommandSelectionChangeData
{
private:
@@ -307,11 +301,13 @@ public:
sal_uLong GetEnd() const { return mnEnd; }
};
+
inline CommandSelectionChangeData::CommandSelectionChangeData()
{
mnStart = mnEnd = 0;
}
+
inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
sal_uLong nEnd )
{
@@ -319,6 +315,7 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
mnEnd = nEnd;
}
+
class VCL_DLLPUBLIC CommandSwipeData
{
double mnVelocityX;
@@ -334,6 +331,7 @@ public:
double getVelocityX() const { return mnVelocityX; }
};
+
class VCL_DLLPUBLIC CommandLongPressData
{
double mnX;
@@ -354,7 +352,6 @@ public:
};
-// - CommandEvent -
enum class CommandEventId
{
NONE = 0,
@@ -381,6 +378,7 @@ enum class CommandEventId
LongPress = 22,
};
+
class VCL_DLLPUBLIC CommandEvent
{
private:
@@ -410,6 +408,7 @@ public:
const CommandLongPressData* GetLongPressData() const;
};
+
inline CommandEvent::CommandEvent()
{
mpData = nullptr;
@@ -417,6 +416,7 @@ inline CommandEvent::CommandEvent()
mbMouseEvent = false;
}
+
inline CommandEvent::CommandEvent( const Point& rMousePos,
CommandEventId nCmd, bool bMEvt, const void* pCmdData ) :
maPos( rMousePos )
@@ -426,6 +426,7 @@ inline CommandEvent::CommandEvent( const Point& rMousePos,
mbMouseEvent = bMEvt;
}
+
inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const
{
if ( mnCommand == CommandEventId::ExtTextInput )
@@ -434,6 +435,7 @@ inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const
return nullptr;
}
+
inline const CommandWheelData* CommandEvent::GetWheelData() const
{
if ( mnCommand == CommandEventId::Wheel )
@@ -442,6 +444,7 @@ inline const CommandWheelData* CommandEvent::GetWheelData() const
return nullptr;
}
+
inline const CommandScrollData* CommandEvent::GetAutoScrollData() const
{
if ( mnCommand == CommandEventId::AutoScroll )
@@ -450,6 +453,7 @@ inline const CommandScrollData* CommandEvent::GetAutoScrollData() const
return nullptr;
}
+
inline const CommandModKeyData* CommandEvent::GetModKeyData() const
{
if( mnCommand == CommandEventId::ModKeyChange )
@@ -458,6 +462,7 @@ inline const CommandModKeyData* CommandEvent::GetModKeyData() const
return nullptr;
}
+
inline const CommandDialogData* CommandEvent::GetDialogData() const
{
if( mnCommand == CommandEventId::ShowDialog )
@@ -466,6 +471,7 @@ inline const CommandDialogData* CommandEvent::GetDialogData() const
return nullptr;
}
+
inline CommandMediaData* CommandEvent::GetMediaData() const
{
if( mnCommand == CommandEventId::Media )
@@ -474,6 +480,7 @@ inline CommandMediaData* CommandEvent::GetMediaData() const
return nullptr;
}
+
inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() const
{
if( mnCommand == CommandEventId::SelectionChange )
@@ -482,6 +489,7 @@ inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData()
return nullptr;
}
+
inline const CommandSwipeData* CommandEvent::GetSwipeData() const
{
if( mnCommand == CommandEventId::Swipe )
@@ -490,6 +498,7 @@ inline const CommandSwipeData* CommandEvent::GetSwipeData() const
return nullptr;
}
+
inline const CommandLongPressData* CommandEvent::GetLongPressData() const
{
if( mnCommand == CommandEventId::LongPress )
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 3ede0ebb4271..803f2f5e0ef7 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -31,7 +31,6 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; }
class StyleSettings;
-// - Control -
class VCL_DLLPUBLIC Control : public vcl::Window
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index f9f427684f8b..e11cdeb22fad 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -25,7 +25,6 @@
#include <vcl/salctype.hxx>
-// - GraphicConverter -
struct ConvertData;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 1c0b92f291cc..3aa38f543802 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -25,7 +25,6 @@
#include <vcl/syswin.hxx>
#include <vcl/vclptr.hxx>
-// - Dialog -
struct DialogImpl;
class VclBox;
@@ -123,7 +122,6 @@ public:
void GrabFocusToFirstControl();
};
-// - ModelessDialog -
class VCL_DLLPUBLIC ModelessDialog : public Dialog
{
ModelessDialog (const ModelessDialog &) = delete;
@@ -133,7 +131,6 @@ public:
explicit ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
};
-// - ModalDialog -
class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 65b70c7028df..3f8f2f6acdf7 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -209,7 +209,6 @@ public:
};
-// - DockingWindow -
class VCL_DLLPUBLIC DockingWindow
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 3e6fbb77c5da..ec947b672db0 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -47,7 +47,6 @@ struct DDInfo;
struct Impl_IMEInfos;
-// - Edit-Types -
#define EDIT_NOLIMIT SAL_MAX_INT32
#define EDIT_UPDATEDATA_TIMEOUT 350
@@ -70,7 +69,6 @@ enum AutocompleteAction{ AUTOCOMPLETE_KEYINPUT, AUTOCOMPLETE_TABFORWARD, AUTOCOM
class Timer;
-// - Edit -
class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient
{
private:
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 6db6d3adfaf5..119027cf0fdc 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -81,7 +81,6 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode,
}
-// - MouseEvent-Types -
enum class MouseEventModifiers
@@ -112,7 +111,6 @@ namespace o3tl
#define MOUSE_RIGHT ((sal_uInt16)0x0004)
-// - MouseEvent -
class VCL_DLLPUBLIC MouseEvent
@@ -244,7 +242,6 @@ public:
};
-// - HelpEvent -
enum class HelpEventMode
{
@@ -341,7 +338,6 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR
}
-// - TrackingEvent -
class VCL_DLLPUBLIC TrackingEvent
@@ -378,7 +374,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
}
-// - NotifyEvent -
enum class MouseNotifyEvent
{
@@ -445,7 +440,6 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const
}
-// - DataChangedEvent -
enum class DataChangedEventType {
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 0f855a35b00f..0741efdf2d37 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -35,7 +35,6 @@ class LocaleDataWrapper;
class LanguageTag;
-// - FormatterBase -
class VCL_DLLPUBLIC FormatterBase
@@ -91,7 +90,6 @@ public:
-// - PatternFormatter -
#define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001)
@@ -130,7 +128,6 @@ public:
};
-// - NumericFormatter -
class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
@@ -209,7 +206,6 @@ public:
};
-// - MetricFormatter -
class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
@@ -267,7 +263,6 @@ public:
-// - CurrencyFormatter -
class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter
@@ -293,7 +288,6 @@ public:
-// - DateFormatter -
class VCL_DLLPUBLIC DateFormatter : public FormatterBase
@@ -387,7 +381,6 @@ public:
-// - TimeFormatter -
class VCL_DLLPUBLIC TimeFormatter : public FormatterBase
@@ -465,7 +458,6 @@ public:
-// - PatternField -
class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter
@@ -481,7 +473,6 @@ public:
-// - NumericField -
class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
@@ -511,7 +502,6 @@ public:
-// - MetricField -
class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
@@ -582,7 +572,6 @@ public:
-// - CurrencyField -
class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
@@ -605,7 +594,6 @@ public:
-// - DateField -
class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter
@@ -639,7 +627,6 @@ public:
};
-// - TimeField -
class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter
@@ -676,7 +663,6 @@ public:
-// - PatternBox -
class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter
@@ -695,7 +681,6 @@ public:
-// - NumericBox -
class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
@@ -719,7 +704,6 @@ public:
-// - MetricBox -
class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
@@ -753,7 +737,6 @@ public:
-// - CurrencyBox -
class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
@@ -774,7 +757,6 @@ public:
};
-// - DateBox -
class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
@@ -794,7 +776,6 @@ public:
-// - TimeBox -
class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 3c9e3a35446b..85188d288821 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -30,7 +30,6 @@
class UserDrawEvent;
-// - FixedText -
class VCL_DLLPUBLIC FixedText : public Control
@@ -92,7 +91,6 @@ public:
};
-// - FixedLine -
class VCL_DLLPUBLIC FixedLine : public Control
@@ -126,7 +124,6 @@ public:
virtual Size GetOptimalSize() const override;
};
-// - FixedBitmap -
class VCL_DLLPUBLIC FixedBitmap : public Control
{
private:
@@ -155,7 +152,6 @@ public:
};
-// - FixedImage -
class VCL_DLLPUBLIC FixedImage : public Control
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 20b0688adc97..01672f0b7650 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -28,7 +28,6 @@
class ToolBox;
-// - FloatingWindow-Types -
enum class FloatWinPopupFlags
@@ -87,7 +86,6 @@ enum HitTest
HITTEST_RECT
};
-// - FloatingWindow -
class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
{
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 6875a5074ca4..15461dcc2031 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -40,7 +40,6 @@ namespace tools {
class Gradient;
-// - GDIMetaFile-Types -
#define GDI_METAFILE_END ((size_t)0xFFFFFFFF)
@@ -54,7 +53,6 @@ enum MtfConversion
};
-// - Color conversion routines -
typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam );
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index b9e461761d2c..f31824dfb8cd 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -29,7 +29,6 @@
class SvStream;
-// - ImpBuffer -
struct ImpBuffer
@@ -49,7 +48,6 @@ struct ImpBuffer
};
-// - ImpSwap -
struct ImpSwap
@@ -69,7 +67,6 @@ struct ImpSwap
};
-// - ImpGfxLink -
struct ImpGfxLink
@@ -90,7 +87,6 @@ struct ImpGfxLink
//#endif // __PRIVATE
-// - GfxLinkType -
enum GfxLinkType
@@ -115,7 +111,6 @@ enum GfxLinkType
#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP
-// - GfxLink -
struct ImpBuffer;
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 3f2404b5ba0a..5c44fc5486d6 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -28,7 +28,6 @@
#include <o3tl/cow_wrapper.hxx>
-// - Impl_Gradient -
class Rectangle;
@@ -60,7 +59,6 @@ public:
};
-// - Gradient -
class VCL_DLLPUBLIC Gradient
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a1d987f7fbe5..bd83af4bb493 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -129,7 +129,6 @@ enum class GraphicFileFormat
XXX = 0xffff
};
-// - GraphicDescriptor -
class VCL_DLLPUBLIC GraphicDescriptor
diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx
index a781cf96d6d2..0ba7e3ad77bd 100644
--- a/include/vcl/group.hxx
+++ b/include/vcl/group.hxx
@@ -25,7 +25,6 @@
#include <vcl/ctrl.hxx>
-// - GroupBox -
class VCL_DLLPUBLIC GroupBox : public Control
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 935ea9ac6e06..0dd3e8c3601d 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -26,7 +26,6 @@
#include <vcl/vclenum.hxx>
-// - Impl_Hatch -
class SvStream;
@@ -47,7 +46,6 @@ struct ImplHatch
};
-// - Hatch -
class VCL_DLLPUBLIC Hatch
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 4d226a8122f8..1970c21dd99a 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -30,7 +30,6 @@ class Rectangle;
namespace vcl { class Window; }
-// - Help-Types -
enum class QuickHelpFlags
{
@@ -59,7 +58,6 @@ namespace o3tl
#define OOO_HELP_INDEX ".help:index"
-// - Help -
class VCL_DLLPUBLIC Help
{
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index cdfd9498916f..582b73274fdb 100644
--- a/include/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
@@ -26,7 +26,6 @@
#include <vcl/bitmapex.hxx>
-// - ImageControl -
class VCL_DLLPUBLIC ImageControl : public FixedImage
diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx
index d1f3f9ff3f5b..ced1d2903bc3 100644
--- a/include/vcl/inputctx.hxx
+++ b/include/vcl/inputctx.hxx
@@ -26,7 +26,6 @@
#include <o3tl/typed_flags_set.hxx>
-// - InputContext-Flags -
enum class InputContextFlags
@@ -43,7 +42,6 @@ namespace o3tl
}
-// - InputContext -
class VCL_DLLPUBLIC InputContext
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index 2faf4a0c93c3..3495bb28dd33 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/drawing/LineCap.hpp>
-// - ImplLineInfo -
class SvStream;
@@ -57,7 +56,6 @@ struct ImplLineInfo
};
-// - LineInfo -
class VCL_DLLPUBLIC LineInfo
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index ad92f1a7c2be..d159d9255b67 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -27,7 +27,6 @@
class LocaleDataWrapper;
-// - LongCurrencyFormatter -
class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase
@@ -73,7 +72,6 @@ public:
};
-// - LongCurrencyField -
class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter
@@ -106,7 +104,6 @@ public:
};
-// - LongCurrencyBox -
class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 2edd16f09923..1fef4f749864 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -29,7 +29,6 @@ class SvStream;
class OutputDevice;
-// - MapMode -
class VCL_DLLPUBLIC MapMode
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index be86fa9e3603..3e47a87df4fd 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -26,7 +26,6 @@
#include <vcl/dllapi.h>
-// - ImplMnemonicTypes -
// Mnemonic Chars, which we want support
@@ -52,7 +51,6 @@
#define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF)
-// - MnemonicGenerator -
class VCL_DLLPUBLIC MnemonicGenerator
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index bc627a4c559a..5e96c3a9eb5a 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -28,7 +28,6 @@
struct ImplMoreButtonData;
-// - MoreButton -
class VCL_DLLPUBLIC MoreButton : public PushButton
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx
index 13eac89d1686..884e8076edc7 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/prgsbar.hxx
@@ -46,13 +46,11 @@
************************************************************************/
-// - WinBits -
#define WB_STDPROGRESSBAR WB_BORDER
-// - ProgressBar -
class VCL_DLLPUBLIC ProgressBar : public vcl::Window
diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index 3dfa9ca6b864..2d5d9b969e10 100644
--- a/include/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
@@ -25,19 +25,16 @@
#include <o3tl/typed_flags_set.hxx>
-// - Duplex Mode -
enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE };
-// - Orientation -
enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
-// - QueueInfo-Types -
enum class PrintQueueFlags
{
@@ -76,7 +73,6 @@ namespace o3tl
#define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF)
-// - Printer-Types -
enum class PrinterCapType
{
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 6037bdcfb1dc..63664484a413 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -29,13 +29,11 @@
#include <vcl/dllapi.h>
-// - Memory -
typedef sal_uInt8* Scanline;
typedef const sal_uInt8* ConstScanline;
-// - Bitmap formats -
#define BMP_FORMAT_BOTTOM_UP 0x00000000UL
#define BMP_FORMAT_TOP_DOWN 0x80000000UL
@@ -86,7 +84,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO
( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) | \
d_ALPHA )
-// - BitmapColor -
class Color;
@@ -139,7 +136,6 @@ public:
inline sal_uInt16 GetColorError( const BitmapColor& rBitmapColor ) const;
};
-// - BitmapPalette -
class Palette;
class VCL_DLLPUBLIC BitmapPalette
@@ -223,7 +219,6 @@ struct VCL_DLLPUBLIC ColorMaskElement
}
};
-// - ColorMask -
class VCL_DLLPUBLIC ColorMask
{
ColorMaskElement maR;
@@ -264,7 +259,6 @@ public:
inline void SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const;
};
-// - BitmapBuffer -
struct VCL_DLLPUBLIC BitmapBuffer
{
sal_uLong mnFormat;
@@ -277,7 +271,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
sal_uInt8* mpBits;
};
-// - Access modes -
typedef enum
{
BITMAP_INFO_ACCESS,
@@ -286,7 +279,6 @@ typedef enum
}
BitmapAccessMode;
-// - StretchAndConvert -
VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = nullptr, const ColorMask* pDstMask = nullptr );
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 99b547baf1d8..e9864609280c 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -27,14 +27,12 @@
class AutoTimer;
-// - ScrollBar-Types -
enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN,
SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET };
-// - ScrollBar -
struct ImplScrollBarData;
@@ -141,7 +139,6 @@ public:
};
-// - ScrollBarBox -
class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index aa0c256d20b6..7576c61dfba5 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -37,7 +37,6 @@ class CommandEvent;
enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION };
-// - FunctionSet -
class VCL_DLLPUBLIC FunctionSet
@@ -62,7 +61,6 @@ public:
};
-// - SelectionEngine -
enum class SelectionEngineFlags {
DRG_ENAB = 0x0001,
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 46de94d538f9..aa6f4d51e77f 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -53,7 +53,6 @@ namespace vcl {
class IconThemeInfo;
}
-// - MouseSettings -
enum class MouseSettingsOptions
{
@@ -177,7 +176,6 @@ struct FrameStyle
-// - StyleSettings -
enum class StyleSettingsOptions
@@ -626,7 +624,6 @@ public:
};
-// - MiscSettings -
class VCL_DLLPUBLIC MiscSettings
@@ -654,7 +651,6 @@ public:
};
-// - HelpSettings -
class VCL_DLLPUBLIC HelpSettings
{
@@ -675,7 +671,6 @@ public:
};
-// - AllSettings -
enum class AllSettingsFlags {
NONE = 0x0000,
diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx
index 7f4bc6f04517..d99b4ff9a431 100644
--- a/include/vcl/sound.hxx
+++ b/include/vcl/sound.hxx
@@ -25,7 +25,6 @@
namespace vcl { class Window; }
-// - Sound -
class VCL_DLLPUBLIC Sound
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index 6f55421e7c00..68392f0f15fb 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -26,7 +26,6 @@
#include <vcl/timer.hxx>
-// - SpinButton -
class VCL_DLLPUBLIC SpinButton : public Control
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 571e8d05b50c..23339b164dc6 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -29,7 +29,6 @@ struct ImplStatusItem;
typedef ::std::vector< ImplStatusItem* > ImplStatusItemList;
-// - Progress-Ausgabe -
void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos,
long nOffset, long nPrgsWidth, long nPrgsHeight,
@@ -37,13 +36,11 @@ void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRende
const Rectangle& rFramePosSize);
-// - StatusBarItemBits -
typedef sal_uInt16 StatusBarItemBits;
-// - Bits fuer StatusBarItems -
#define SIB_LEFT ((StatusBarItemBits)0x0001)
@@ -56,7 +53,6 @@ typedef sal_uInt16 StatusBarItemBits;
#define SIB_USERDRAW ((StatusBarItemBits)0x0080)
-// - StatusBar-Types -
#define STATUSBAR_APPEND ((sal_uInt16)0xFFFF)
@@ -64,7 +60,6 @@ typedef sal_uInt16 StatusBarItemBits;
#define STATUSBAR_OFFSET ((long)5)
-// - StatusBar -
class VCL_DLLPUBLIC StatusBar : public vcl::Window
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index e95cbf93f7bb..58771f29da92 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -32,7 +32,6 @@ class NotebookBarWindow;
class TaskPaneList;
class VclContainer;
-// - Icon-Types -
#define ICON_LO_DEFAULT 1
#define ICON_TEXT_DOCUMENT 2
#define ICON_SPREADSHEET_DOCUMENT 4
@@ -44,7 +43,6 @@ class VclContainer;
#define ICON_MACROLIBRARY 1
-// - WindowStateData -
#define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001)
@@ -121,7 +119,6 @@ public:
};
-// - SystemWindow-Types -
enum class MenuBarMode
@@ -136,7 +133,6 @@ enum class TitleButton
Menu = 4,
};
-// - SystemWindow -
class VCL_DLLPUBLIC SystemWindow
: public vcl::Window
, public VclBuilderContainer
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index ff04ade6181c..734607a450b5 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -26,7 +26,6 @@
#include <vcl/window.hxx>
-// - TabPage -
class VCL_DLLPUBLIC TabPage
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5487745d36ab..060c068ead4e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -121,7 +121,6 @@ namespace o3tl
}
-// - WindowTypes -
// Type fuer GetWindow()
@@ -430,7 +429,6 @@ enum class GetDlgWindowType
};
-// - Window -
#ifdef DBG_UTIL
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 5f0523858596..507de99dddbe 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
struct SystemParentData;
-// - WorkWindow - Types -
// Presentation Flags
@@ -47,7 +46,6 @@ namespace o3tl
}
-// - WorkWindow -
class VCL_DLLPUBLIC WorkWindow : public SystemWindow
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 151d57da8bf7..e78ae0a82ca3 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -22,13 +22,13 @@ class DocumentSettingsSerializer {
public:
// Import objects and update properties (eliding URLs)
virtual css::uno::Sequence<css::beans::PropertyValue>
- filterStreamsFromStorage(
+ filterStreamsFromStorage(
OUString const & referer,
const css::uno::Reference< css::embed::XStorage > &xStorage,
const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0;
// Export objects and update properties with relative URLs into this storage
virtual css::uno::Sequence<css::beans::PropertyValue>
- filterStreamsToStorage(
+ filterStreamsToStorage(
const css::uno::Reference< css::embed::XStorage > &xStorage,
const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0;
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 28156d0570d7..50b70eee5346 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -74,7 +74,7 @@ private:
bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const;
void insertReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
- IdMap_t maEntries;
+ IdMap_t maEntries;
sal_Int32 mnNextId;
};
diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index 2d22d208f89d..b57f7549ab23 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -152,7 +152,7 @@
#define XML_TYPE_NEG_PERCENT8 0x00002022 // (100-x)%
#define XML_TYPE_NEG_PERCENT16 0x00002023 // (100-x)
#define XML_TYPE_DOUBLE_PERCENT 0x00002024 // 50% (source is a double from 0.0 to 1.0)
-#define XML_TYPE_HEX 0x00002025 // 00544F1B
+#define XML_TYPE_HEX 0x00002025 // 00544F1B
// special basic types
#define XML_TYPE_RECTANGLE_LEFT 0x00000100 // the Left member of a awt::Rectangle as a measure
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 31ba45faa815..128dc726e231 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -143,7 +143,7 @@ public:
::xmloff::token::XML_TOKEN_INVALID );
/** convert double number to string (using ::rtl::math) and DO
- convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */
+ convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */
void convertDouble(OUStringBuffer& rBuffer,
double fNumber, bool bWriteUnits) const;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
index bb7580ba75ce..656eb6942a81 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
@@ -53,7 +53,7 @@ Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments )
OUString MyJob_getImplementationName ()
throw (RuntimeException)
{
- return OUString( "com.sun.star.comp.Office.MyJob" );
+ return OUString( "com.sun.star.comp.Office.MyJob" );
}
#define SERVICE_NAME "com.sun.star.task.Job"
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 852a063d2c4d..924e7695a62e 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -122,7 +122,7 @@ Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& a
return 0;
Reference < XController > xCtrl = mxFrame->getController();
- if ( xCtrl.is() && aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" )
+ if ( xCtrl.is() && aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" )
{
Reference < XTextViewCursorSupplier > xCursor( xCtrl, UNO_QUERY );
Reference < XSpreadsheetView > xView( xCtrl, UNO_QUERY );
@@ -130,12 +130,12 @@ Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& a
// without an appropriate corresponding document the handler doesn't function
return xRet;
- if ( aURL.Path == "ImageButtonCmd" ||
- aURL.Path == "ComboboxCmd" ||
- aURL.Path == "ToggleDropdownButtonCmd" ||
- aURL.Path == "DropdownButtonCmd" ||
- aURL.Path == "SpinfieldCmd" ||
- aURL.Path == "EditfieldCmd" ||
+ if ( aURL.Path == "ImageButtonCmd" ||
+ aURL.Path == "ComboboxCmd" ||
+ aURL.Path == "ToggleDropdownButtonCmd" ||
+ aURL.Path == "DropdownButtonCmd" ||
+ aURL.Path == "SpinfieldCmd" ||
+ aURL.Path == "EditfieldCmd" ||
aURL.Path == "DropdownboxCmd" )
{
xRet = aListenerHelper.GetDispatch( mxFrame, aURL.Path );
@@ -217,7 +217,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
if ( aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" )
{
- if ( aURL.Path == "ImageButtonCmd" )
+ if ( aURL.Path == "ImageButtonCmd" )
{
// open the LibreOffice web page
::rtl::OUString sURL("http://www.libreoffice.org");
diff --git a/onlineupdate/source/update/inc/nsWindowsHelpers.h b/onlineupdate/source/update/inc/nsWindowsHelpers.h
index 0a64354c8152..76a3aeb6585c 100644
--- a/onlineupdate/source/update/inc/nsWindowsHelpers.h
+++ b/onlineupdate/source/update/inc/nsWindowsHelpers.h
@@ -10,9 +10,7 @@
#include <windows.h>
#include "nsAutoRef.h"
-// ----------------------------------------------------------------------------
// Critical Section helper class
-// ----------------------------------------------------------------------------
class AutoCriticalSection
{
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index cbd09ae94ef9..7b54b4fe4b3d 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -36,7 +36,7 @@ public:
private:
- DiagramDataPtr mpDataPtr;
+ DiagramDataPtr mpDataPtr;
};
class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
@@ -50,7 +50,7 @@ public:
private:
- DiagramLayoutPtr mpDataPtr;
+ DiagramLayoutPtr mpDataPtr;
};
class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 7a6213aa4e13..5b24685ad5b0 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -56,7 +56,6 @@ using namespace css::report;
using namespace css::io;
using namespace css::xml::sax;
-// - ORptExport -
#define PROGRESS_BAR_STEP 20
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 529fdd61ac89..5335864c5f2a 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -351,7 +351,6 @@ Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) t
}
-// - ORptFilter -
ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext, SvXMLImportFlags nImportFlags )
:SvXMLImport(_rxContext, getImplementationName_Static(), nImportFlags)
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 1def596e2ef4..d6134eb9023c 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
-// - ORptFilter -
class ORptFilter : public SvXMLImport
{
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index d8ba5cefd8e1..e3863bc8f182 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4822,7 +4822,6 @@ void Test::testFuncINDIRECT()
m_pDoc->DeleteTab(0);
}
-// --------------------------------------------------------------------------
// Test case for tdf#83365 - Access across spreadsheet returns Err:504
//
void Test::testFuncINDIRECT2()
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 230a9a77530e..d207d7619191 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -74,13 +74,13 @@ private:
static void MakeFont( ENTRY* pEntry );
public:
- const static sal_uInt16 nSize = 8;
+ const static sal_uInt16 nSize = 8;
void Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet );
void SetName( const sal_uInt16 nIndex, const OUString& rName );
void SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight );
void SetType( const sal_uInt16 nIndex, const sal_uInt16 nType );
private:
- ENTRY pData[ nSize ];
+ ENTRY pData[ nSize ];
};
#endif
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 59051350a404..e51df0c08d52 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -174,14 +174,14 @@ private:
#if 0
bool GrowError();
#endif
- bool GrowTripel( sal_uInt16 nByMin = 1 );
+ bool GrowTripel( sal_uInt16 nByMin = 1 );
bool GrowId();
bool GrowElement();
bool GrowExt();
bool GrowNlf();
bool GrowMatrix();
- bool GetElement( const sal_uInt16 nId );
- bool GetElementRek( const sal_uInt16 nId );
+ bool GetElement( const sal_uInt16 nId );
+ bool GetElementRek( const sal_uInt16 nId );
public:
TokenPool( svl::SharedStringPool& rSPool );
~TokenPool();
@@ -291,7 +291,7 @@ inline TokenPool& TokenPool::operator <<( const TokenId& rId )
"-TokenPool::operator <<: TokenId in DefToken-Range!" );
if( nP_IdAkt >= nP_Id )
- if (!GrowId())
+ if (!GrowId())
return *this;
pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rId ) - 1;
@@ -306,7 +306,7 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
"-TokenPool::operator<<: enum too large!" );
if( nP_IdAkt >= nP_Id )
- if (!GrowId())
+ if (!GrowId())
return *this;
pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) eId ) + nScTokenOff;
@@ -318,7 +318,7 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
inline TokenPool& TokenPool::operator <<( TokenStack& rStack )
{
if( nP_IdAkt >= nP_Id )
- if (!GrowId())
+ if (!GrowId())
return *this;
pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rStack.Get() ) - 1;
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index f0ad80ebadb0..06e9ba28662d 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -140,7 +140,7 @@ WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
aStream.ReadUInt16( nVersNr );
if( aStream.IsEof() ) return eWK_Error;
if( nVersNr == 0x0004 && nRecLen == 26 )
- { // 4 bytes of 26 read => skip 22 (read instead of seek to make IsEof() work just in case)
+ { // 4 bytes of 26 read => skip 22 (read instead of seek to make IsEof() work just in case)
sal_Char aDummy[22];
aStream.Read( aDummy, 22 );
return aStream.IsEof() ? eWK_Error : eWK3;
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 23b4c5d10e63..6f5575b2f8ee 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -172,7 +172,7 @@ void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLin
const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) const
{
OSL_ENSURE( nLotIndex > 0 && nLotIndex < 7,
- "-LotAttrCache::GetColorItem(): caller hast to check index!" );
+ "-LotAttrCache::GetColorItem(): caller hast to check index!" );
return *ppColorItems[ nLotIndex - 1 ];
}
@@ -180,7 +180,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) cons
const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
{
// color <-> index fits background, but not for fonts (0 <-> 7)!
- OSL_ENSURE( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7, caller hast to check index!" );
+ OSL_ENSURE( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7, caller hast to check index!" );
return pColTab[ nLotIndex ];
}
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index a75dc992c2aa..58c5e18609ed 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -248,7 +248,7 @@ FltError ImportLotus::Read(SvStream& rIn)
{
pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
- if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+ if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
bRead = false;
else
{
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index cf783211b4d1..81ef2cfa1231 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -316,7 +316,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const
// Only process an oleObject or control if outside a mc:AlternateContent
// element OR if within a mc:Fallback. I suppose ideally we
// should process the stuff within 'mc:Choice'
- case XLS_TOKEN( controls ):
+ case XLS_TOKEN( controls ):
case XLS_TOKEN( oleObjects ):
if ( getCurrentElement() == XLS_TOKEN( controls ) )
{
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 0c3e05dbc076..6d2e05b223ac 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -412,7 +412,6 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void )
DoScroll(mpScrollBar->GetDelta());
}
-// -------------------------------------------------------------------
// Conditional Format Dialog
//
ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
@@ -583,7 +582,6 @@ void ScCondFormatDlg::InvalidateRefData()
mpLastEdit = nullptr;
}
-// -------------------------------------------------------------
// Close the Conditional Format Dialog
//
bool ScCondFormatDlg::Close()
@@ -591,7 +589,6 @@ bool ScCondFormatDlg::Close()
return DoClose( ScCondFormatDlgWrapper::GetChildWindowId() );
}
-// ------------------------------------------------------------------------
// Occurs when the Conditional Format Dialog the OK button is pressed.
//
void ScCondFormatDlg::OkPressed()
@@ -615,7 +612,6 @@ void ScCondFormatDlg::OkPressed()
Close();
}
-// ------------------------------------------------------------------------
// Occurs when the Conditional Format Dialog is cancelled.
//
void ScCondFormatDlg::CancelPressed()
@@ -630,7 +626,6 @@ void ScCondFormatDlg::CancelPressed()
Close();
}
-// ------------------------------------------------------------------------------
// Parse xml string parameters used to initialize the Conditional Format Dialog
// when it is created.
//
@@ -706,7 +701,6 @@ bool ScCondFormatDlg::ParseXmlString(const OUString& sXMLString,
return bRetVal;
}
-// ---------------------------------------------------------------------------------------
// Generate xml string parameters used to initialize the Conditional Format Dialog
// when it is created.
//
@@ -787,7 +781,6 @@ IMPL_LINK_TYPED( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void )
mpLastEdit = static_cast<formula::RefEdit*>(&rControl);
}
-// ------------------------------------------------------
// Conditional Format Dialog button click event handler.
//
IMPL_LINK_TYPED( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void)
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 30c213b43d41..e0fb268df0b9 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -146,7 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList()
return pList;
}
-// ---------------------------------------------------------------
// Get the current conditional format selected.
//
ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected()
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 732cfbb0db27..5f9dc0cc7b10 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -417,14 +417,14 @@ void ScDocShell::ReloadTabLinks()
::sfx2::SvBaseLink* pBase = pLinkManager->GetLinks()[i].get();
if (ScTableLink* pTabLink = dynamic_cast<ScTableLink*>(pBase))
{
-// pTabLink->SetAddUndo(sal_False); //! Undo's zusammenfassen
+// pTabLink->SetAddUndo(sal_False); //! Undo's zusammenfassen
- // Painting only after Update() makes no sense:
- // ScTableLink::Refresh() will post a Paint only is bDoPaint is true
+ // Painting only after Update() makes no sense:
+ // ScTableLink::Refresh() will post a Paint only is bDoPaint is true
// pTabLink->SetPaint(false); // Paint nur einmal am Ende
pTabLink->Update();
//pTabLink->SetPaint(true);
-// pTabLink->SetAddUndo(sal_True);
+// pTabLink->SetAddUndo(sal_True);
bAny = true;
}
}
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 66c3e177a481..06cdb5f2f048 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1419,7 +1419,7 @@ void ScUndoRefreshLink::Undo()
}
pDocShell->PostPaintGridAll();
- pDocShell->PostPaintExtras();
+ pDocShell->PostPaintExtras();
EndUndo();
}
@@ -1450,7 +1450,7 @@ void ScUndoRefreshLink::Redo()
}
pDocShell->PostPaintGridAll();
- pDocShell->PostPaintExtras();
+ pDocShell->PostPaintExtras();
EndUndo();
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index a77fdf603da3..a5e09ed1a6a3 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -556,8 +556,8 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
if (!rDesc.maDefArgNames.empty() && !rDesc.maDefArgDescs.empty() && rDesc.pDefArgFlags )
{
sal_uInt16 nCount = rDesc.nArgCount;
- if (nCount >= PAIRED_VAR_ARGS)
- nCount -= PAIRED_VAR_ARGS - 2;
+ if (nCount >= PAIRED_VAR_ARGS)
+ nCount -= PAIRED_VAR_ARGS - 2;
else if (nCount >= VAR_ARGS)
nCount -= VAR_ARGS - 1;
sal_uInt16 nSeqCount = rDesc.GetSuppressedArgCount();
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 2fceedd72e5f..661b2ad21e70 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -384,18 +384,18 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource )
ScDocShell*
getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
{
- ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf );
- if ( !pUno )
+ ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf );
+ if ( !pUno )
throw uno::RuntimeException("Failed to access underlying uno range object" );
- return pUno->GetDocShell();
+ return pUno->GetDocShell();
}
ScDocShell*
getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
{
- // need the ScCellRangesBase to get docshell
+ // need the ScCellRangesBase to get docshell
uno::Reference< uno::XInterface > xIf( xRange );
- return getDocShellFromIf(xIf );
+ return getDocShellFromIf(xIf );
}
ScDocShell*
@@ -408,22 +408,22 @@ getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >&
uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
{
- ScDocShell* pDocShell = getDocShellFromIf(xIf );
- return pDocShell->GetModel();
+ ScDocShell* pDocShell = getDocShellFromIf(xIf );
+ return pDocShell->GetModel();
}
uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
{
// the XInterface for getImplementation can be any derived interface, no need for queryInterface
uno::Reference< uno::XInterface > xIf( xRange );
- return getModelFromXIf( xIf );
+ return getModelFromXIf( xIf );
}
ScDocument&
getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange )
{
- ScDocShell* pDocShell = getDocShellFromRange( xRange );
- if ( !pDocShell )
+ ScDocShell* pDocShell = getDocShellFromRange( xRange );
+ if ( !pDocShell )
throw uno::RuntimeException("Failed to access underlying docshell from uno range object" );
ScDocument& rDoc = pDocShell->GetDocument();
return rDoc;
@@ -1625,10 +1625,10 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception)
void SAL_CALL
ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception)
{
- // FIXME: need to check if we need to combine FORMATTED
+ // FIXME: need to check if we need to combine FORMATTED
using namespace ::com::sun::star::sheet::CellFlags;
- sal_Int32 nFlags = HARDATTR | FORMATTED | EDITATTR;
- ClearContents( nFlags, false );
+ sal_Int32 nFlags = HARDATTR | FORMATTED | EDITATTR;
+ ClearContents( nFlags, false );
}
void
@@ -4433,7 +4433,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const
uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
// set autofilter
xDBRangeProps->setPropertyValue( "AutoFilter", uno::Any(sal_True) );
- // set header (autofilter always need column headers)
+ // set header (autofilter always need column headers)
uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
bool bHasColHeader = false;
ScDocument* pDoc = pShell ? &pShell->GetDocument() : nullptr;
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 2bd237a327a7..ba6c992c6fcf 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -218,7 +218,7 @@ uno::Reference< excel::XWorksheet >
ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception)
{
uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW );
- uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XSpreadsheet > xSheet( xView->getActiveSheet(), uno::UNO_SET_THROW );
// #162503# return the original sheet module wrapper object, instead of a new instance
uno::Reference< excel::XWorksheet > xWorksheet( excel::getUnoSheetModuleObj( xSheet ), uno::UNO_QUERY );
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index b0af04eda3a5..5d5515863e35 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1848,7 +1848,7 @@ void Complex::Sin() throw( uno::RuntimeException, lang::IllegalArgumentException
void Complex::Cos() throw( uno::RuntimeException, lang::IllegalArgumentException )
{
- if( !::rtl::math::isValidArcArg( r ) )
+ if( !::rtl::math::isValidArcArg( r ) )
throw lang::IllegalArgumentException();
if( i )
@@ -2009,13 +2009,13 @@ void Complex::Sinh() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
if( i )
{
- double r_;
+ double r_;
r_ = sinh( r ) * cos( i );
- i = cosh( r ) * sin( i );
- r = r_;
- }
- else
- r = sinh( r );
+ i = cosh( r ) * sin( i );
+ r = r_;
+ }
+ else
+ r = sinh( r );
}
@@ -2026,13 +2026,13 @@ void Complex::Cosh() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
if( i )
{
- double r_;
+ double r_;
r_ = cosh( r ) * cos( i );
- i = sinh( r ) * sin( i );
- r = r_;
- }
- else
- r = cosh( r );
+ i = sinh( r ) * sin( i );
+ r = r_;
+ }
+ else
+ r = cosh( r );
}
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 07899819f54c..90b3baaf3076 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -121,7 +121,6 @@ void SdGRFFilter_ImplInteractionHdl::handle( const css::uno::Reference< css::tas
m_xInter->handle( xRequest );
}
-// - SdPPTFilter -
SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
SdFilter( rMedium, rDocShell, true )
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 5566b47b9bbc..aabe2f0b4332 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -99,7 +99,6 @@ public:
};
-// - SdHtmlOptionsDialog -
SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
meDocType ( DOCUMENT_TYPE_DRAW )
{
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index c1f0c8eba237..c4bc08522ac9 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -38,7 +38,6 @@
#include "htmlex.hxx"
#include "sdhtmlfilter.hxx"
-// - SdPPTFilter -
SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress )
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 56033c7516d1..599af58b01d7 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -114,7 +114,7 @@ namespace ppt
#define DFF_ANIM_GROUP_ID 19
#define DFF_ANIM_NODE_TYPE 20
#define DFF_ANIM_VOLUME 22
-#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1)
+#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1)
// property types
#define DFF_ANIM_PROP_TYPE_BYTE 0
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index ac29715ba607..990691d10af7 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -35,13 +35,11 @@
#include "drawdoc.hxx"
#include "sdfilter.hxx"
-// - Namespaces -
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-// - SdFilter -
SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress )
: mxModel( rDocShell.GetModel() )
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index f5318b0d6047..98a74536cde6 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -32,7 +32,6 @@
#include "DrawDocShell.hxx"
#include <tools/urlobj.hxx>
-// - Namespaces -
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -61,7 +60,6 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
#endif
-// - SdPPTFilter -
SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress ),
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 5e522ef963b6..98ae6551da02 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -156,7 +156,6 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
return &gServices[ (bImport ? 2 : 0) + ((nStoreVer == SOFFICE_FILEFORMAT_60) ? 4 : 0) + (bDraw ? 1 : 0 ) ];
}
-// - SdXMLWrapper -
SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index d18cb77eca31..c80cf870690b 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -42,7 +42,6 @@ template< class T > T getSafeValue( const Any& rAny )
return value;
}
-// - SdOptionsItem -
SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ) :
ConfigItem ( rSubTree ),
@@ -78,7 +77,6 @@ void SdOptionsItem::SetModified()
ConfigItem::SetModified();
}
-// - SdOptionsGeneric -
SdOptionsGeneric::SdOptionsGeneric(sal_uInt16 nConfigId, const OUString& rSubTree)
: maSubTree(rSubTree)
, mpCfgItem( nullptr)
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 21c58dc7529e..8253ee14c0a7 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -221,7 +221,7 @@ IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
sal_uInt16 aPos = 0;
for (std::vector<OUString>::iterator it = maLayoutNames.begin();
- it != maLayoutNames.end() && !bExists; ++it, ++aPos)
+ it != maLayoutNames.end() && !bExists; ++it, ++aPos)
{
if( aCompareStr == *it )
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index ed3ee16746bc..27979f8dfefd 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -81,7 +81,6 @@ bool SdPageObjsTLB::IsInDrag()
SotClipboardFormatId SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = static_cast<SotClipboardFormatId>(SAL_MAX_UINT32);
-// - SdPageObjsTLB::SdPageObjsTransferable -
SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
SdPageObjsTLB& rParent,
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 55f3295834e8..1588c9f94a03 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -105,7 +105,7 @@ void Client::ObjectAreaChanged()
if (rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
- SdrOle2Obj* pObj = dynamic_cast< SdrOle2Obj* >(pMark->GetMarkedSdrObj());
+ SdrOle2Obj* pObj = dynamic_cast< SdrOle2Obj* >(pMark->GetMarkedSdrObj());
if(pObj)
{
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 14d2a02c4c79..807119d65ec6 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -329,7 +329,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
const ConfigurationChangeEvent& /* rEvent */ )
throw (RuntimeException, std::exception)
{
- // FIXME: nothing to do
+ // FIXME: nothing to do
}
//===== lang::XEventListener ==================================================
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 75ac9109e38a..f5108afe0f7b 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -72,7 +72,6 @@ void RegisterInterfaces(SfxModule* pMod)
TableObjectBar::RegisterInterface(pMod);
}
-// - TableObjectBar -
SFX_IMPL_INTERFACE(TableObjectBar, SfxShell)
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 21c691968a3a..52f77cb429f7 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -52,7 +52,6 @@ using namespace sd;
namespace sd {
-// - GraphicObjectBar -
SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell)
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 46a11572163f..721ce106654d 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -48,7 +48,6 @@ using namespace sd;
namespace sd {
-// - MediaObjectBar -
SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell)
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7545856d4857..3bfe60fc63c9 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -80,7 +80,6 @@ namespace sd {
bool DrawViewShell::mbPipette = false;
-// - ScannerEventListener -
class ScannerEventListener : public ::cppu::WeakImplHelper< lang::XEventListener >
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 7834bf19d8ba..0e6a8de22d80 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1791,7 +1791,6 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
}
}
-// - OutlineViewModelChangeGuard -
OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView )
: mrView( rView )
@@ -1804,7 +1803,6 @@ OutlineViewModelChangeGuard::~OutlineViewModelChangeGuard()
mrView.EndModelChange();
}
-// - OutlineViewPageChangesGuard -
OutlineViewPageChangesGuard::OutlineViewPageChangesGuard( OutlineView* pView )
: mpView( pView )
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 598faf4e9fa7..486535fa248d 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -71,7 +71,6 @@ namespace sd {
using namespace ::com::sun::star;
-// - SdNavigatorDropEvent -
struct SdNavigatorDropEvent : public ExecuteDropEvent
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5b89c81f0d94..0a162e5b9fbb 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -78,7 +78,6 @@
#include <svx/xbtmpit.hxx>
#include <memory>
-// - Namespaces -
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index b5f1e57e40a3..bb7c51de6708 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -42,7 +42,6 @@
namespace sd {
-// - SdTabControl::SdPageObjsTransferable -
TabControl::TabControlTransferable::~TabControlTransferable()
{
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index 7293a5084e52..c152d31141a1 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -90,7 +90,6 @@ class GraphicCollector
};
-// - GRAPHICCOLLECTOR -
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 710834707ffe..164a3e22080e 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -477,7 +477,6 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
}
-// - ImpOptimizer -
ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel ) :
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 1b4a29e4f8d7..974e1107d099 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
-// - PDFExport -
class ImpOptimizer : public OptimizationStats
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 45733ba2dbad..b129b33a1802 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -38,7 +38,6 @@
-// - INFORMATIONDIALOG -
using namespace ::com::sun::star;
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 163da92df607..3fdc72d5eaa5 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -41,7 +41,6 @@
#include <cppuhelper/implbase.hxx>
-// - InformationDialog -
class InformationDialog : public UnoDialog, public ConfigurationAccess
{
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index db3b535e37b4..54ce34f9fc6f 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -31,7 +31,6 @@
#include <osl/time.h>
-// - OPTIMIZERDIALOG -
using namespace ::com::sun::star::io;
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 789df68e58ee..ccd942d4c14b 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -55,7 +55,6 @@
#define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X
-// - OPTIMIZERDIALOG -
class OptimizerDialog : public UnoDialog, public ConfigurationAccess
{
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 8977a7096e3c..c599b185aa5a 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -21,7 +21,6 @@
#include "optimizerdialog.hxx"
-// - OptimizerDialog -
#include "pppoptimizer.hxx"
#include "graphiccollector.hxx"
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 74219a8d3716..d47c023c3e46 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
-// - PPPOptimizer -
PPPOptimizer::PPPOptimizer(
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 6b83c180e3a7..9508caca5221 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XController.hpp>
-// - PPPOptimizer -
class PPPOptimizer : public cppu::WeakImplHelper<
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 203b66c8f257..090fc8264c5b 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -35,7 +35,6 @@
#include <cppuhelper/implbase.hxx>
-// - PPPOptimizerDialog -
class OptimizerDialog;
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 10f30686c4bd..d75d50b4c350 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/view/XControlAccess.hpp>
-// - UnoDialog -
using namespace ::com::sun::star::awt;
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 46581e0161d9..efeda5cd6ec0 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -50,7 +50,6 @@
#include <com/sun/star/awt/Size.hpp>
-// - UnoDialog -
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index e148b2677181..6b15715deab2 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -192,7 +192,7 @@ namespace pdfi
virtual void endPage() override;
//----- link borders
- #if POPPLER_CHECK_VERSION(0, 19, 0)
+ #if POPPLER_CHECK_VERSION(0, 19, 0)
virtual void processLink(AnnotLink *link) override;
#elif POPPLER_CHECK_VERSION(0, 17, 0)
virtual void processLink(AnnotLink *link, Catalog *catalog) override;
diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx
index b617e816f0c4..9a0e89d8ac04 100644
--- a/sfx2/source/dialog/bluthsnd.cxx
+++ b/sfx2/source/dialog/bluthsnd.cxx
@@ -20,7 +20,7 @@
SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame,
const OUString& rType )
{
- SaveResult eSaveResult;
+ SaveResult eSaveResult;
SendMailResult eResult = SEND_MAIL_ERROR;
OUString aFileName;
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 265025cdb3b3..f06e849b61d1 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -29,7 +29,6 @@
#include <vector>
-// - Conversation -
struct Conversation
@@ -41,7 +40,6 @@ struct Conversation
typedef ::std::vector< Conversation* > ConvList;
-// - DdeInternal -
class DdeInternal
@@ -59,7 +57,6 @@ public:
};
-// - DdeString -
class DdeString
@@ -81,7 +78,6 @@ public:
};
-// - DdeDataImp -
struct DdeDataImp
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 73d1cf1108d6..5baf1374ff02 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::accessibility;
namespace svtools {
-// - ToolbarMenuAcc -
ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent )
@@ -568,7 +567,6 @@ void ToolbarMenuAcc::ThrowIfDisposed() throw (DisposedException)
}
-// - ToolbarMenuEntryAcc -
ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent )
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index b57c0c908bd6..cae14d6cdf85 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -56,7 +56,6 @@ const int BORDER_X = 0;
const int BORDER_Y = 0;
-// - ToolbarMenuEntry -
class ToolbarMenuEntry
@@ -100,7 +99,6 @@ public:
};
-// - ToolbarMenuAcc -
typedef ::cppu::WeakComponentImplHelper<
@@ -188,7 +186,6 @@ private:
};
-// - ToolbarMenuEntryAcc -
typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible,
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 66548367d96c..4ad7bfff6833 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
-// - ValueSetItem -
ValueSetItem::ValueSetItem( ValueSet& rParent )
@@ -66,7 +65,6 @@ uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool b
}
-// - ValueSetAcc -
ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) :
@@ -760,7 +758,6 @@ bool ValueSetAcc::HasNoneField() const
return ((mpParent->GetStyle() & WB_NONEFIELD) != 0);
}
-// - ValueItemAcc -
ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisabled ) :
mpParent( pParent ),
mbIsTransientChildrenDisabled( bIsTransientChildrenDisabled )
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index ac147239217b..70bed42125d7 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::ui::dialogs;
-// - ColorDialog -
SvColorDialog::SvColorDi