[Libreoffice-commits] core.git: cui/source dbaccess/source dtrans/source forms/source fpicker/source include/basegfx include/comphelper include/connectivity include/drawinglayer include/framework include/svtools include/svx include/unotools include/xmloff linguistic/source reportdesign/source sal/workben shell/source svx/inc svx/source sw/inc ucb/source vcl/generic vcl/inc vcl/source xmlhelp/source xmloff/inc xmloff/source xmlsecurity/source
Tor Lillqvist
tml at collabora.com
Wed Apr 29 21:19:58 PDT 2015
cui/source/options/optgdlg.hxx | 10 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 1
dtrans/source/win32/workbench/XTDo.hxx | 1
forms/source/xforms/propertysetbase.hxx | 1
forms/source/xforms/unohelper.hxx | 8 +-
fpicker/source/aqua/SalAquaFilePicker.hxx | 32 ---------
fpicker/source/win32/filepicker/FilePicker.hxx | 35 ----------
fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 19 -----
fpicker/source/win32/filepicker/customcontrolfactory.hxx | 8 --
fpicker/source/win32/filepicker/previewadapter.hxx | 4 -
include/basegfx/color/bcolor.hxx | 5 -
include/basegfx/curve/b2dcubicbezier.hxx | 7 --
include/basegfx/pixel/bpixel.hxx | 5 -
include/basegfx/point/b2dpoint.hxx | 1
include/basegfx/point/b2ipoint.hxx | 1
include/basegfx/point/b3dpoint.hxx | 1
include/basegfx/point/b3ipoint.hxx | 1
include/basegfx/polygon/b2dpolygon.hxx | 3
include/basegfx/polygon/b2dpolypolygon.hxx | 3
include/basegfx/polygon/b3dpolygon.hxx | 6 -
include/basegfx/polygon/b3dpolypolygon.hxx | 5 -
include/basegfx/range/b2drange.hxx | 1
include/basegfx/range/b3drange.hxx | 1
include/basegfx/raster/bpixelraster.hxx | 5 -
include/basegfx/raster/bzpixelraster.hxx | 5 -
include/basegfx/raster/rasterconvert3d.hxx | 6 -
include/basegfx/tuple/b2dtuple.hxx | 1
include/basegfx/tuple/b3dtuple.hxx | 1
include/basegfx/vector/b2dvector.hxx | 1
include/basegfx/vector/b2ivector.hxx | 1
include/basegfx/vector/b3dvector.hxx | 5 -
include/basegfx/vector/b3ivector.hxx | 1
include/comphelper/accimplaccess.hxx | 13 ---
include/connectivity/dbconversion.hxx | 8 --
include/connectivity/sqlnode.hxx | 3
include/connectivity/sqlparse.hxx | 7 --
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 7 --
include/drawinglayer/processor2d/canvasprocessor.hxx | 7 --
include/drawinglayer/processor2d/hittestprocessor2d.hxx | 7 --
include/drawinglayer/processor2d/processorfromoutputdevice.hxx | 7 --
include/drawinglayer/texture/texture3d.hxx | 13 ---
include/framework/addonsoptions.hxx | 25 -------
include/svtools/optionsdrawinglayer.hxx | 28 --------
include/svx/e3dsceneupdater.hxx | 5 -
include/svx/sdr/animation/animationstate.hxx | 9 --
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx | 3
include/svx/sdr/overlay/overlaymanager.hxx | 7 --
include/svx/sdr/overlay/overlayobject.hxx | 13 ---
include/svx/sdr/properties/properties.hxx | 11 ---
include/svx/sdrmasterpagedescriptor.hxx | 8 --
include/svx/sdrobjectuser.hxx | 5 -
include/svx/sdrpageuser.hxx | 5 -
include/svx/sdrpagewindow.hxx | 2
include/svx/sdrpaintwindow.hxx | 12 ---
include/svx/svdobj.hxx | 6 -
include/unotools/viewoptions.hxx | 2
include/xmloff/shapeexport.hxx | 6 -
include/xmloff/table/XMLTableExport.hxx | 4 -
include/xmloff/xmlerror.hxx | 13 ---
include/xmloff/xmluconv.hxx | 6 -
linguistic/source/gciterator.cxx | 3
linguistic/source/lngsvcmgr.cxx | 5 -
reportdesign/source/ui/inc/MarkedSection.hxx | 2
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 6 -
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx | 6 -
svx/inc/sdr/contact/objectcontactofpageview.hxx | 7 --
svx/inc/sdr/contact/viewcontactofgraphic.hxx | 7 --
svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx | 6 -
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 7 --
svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx | 6 -
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 7 --
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx | 7 --
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 27 -------
svx/inc/sdr/properties/itemsettools.hxx | 8 --
svx/inc/svdglob.hxx | 6 -
svx/source/inc/clonelist.hxx | 1
svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 6 -
svx/source/svdraw/svddrgm1.hxx | 4 -
svx/source/table/viewcontactoftableobj.hxx | 7 --
sw/inc/doc.hxx | 1
sw/inc/node.hxx | 2
ucb/source/ucp/file/filinpstr.hxx | 5 -
vcl/generic/print/printerjob.cxx | 2
vcl/inc/fontmanager.hxx | 6 -
vcl/inc/generic/printergfx.hxx | 5 -
vcl/inc/generic/printerjob.hxx | 10 --
vcl/inc/graphite_layout.hxx | 10 --
vcl/source/glyphs/graphite_layout.cxx | 8 --
xmlhelp/source/cxxhelp/provider/inputstream.hxx | 5 -
xmloff/inc/xexptran.hxx | 4 -
xmloff/source/xforms/SchemaContext.hxx | 11 ---
xmloff/source/xforms/SchemaRestrictionContext.hxx | 11 ---
xmloff/source/xforms/SchemaSimpleTypeContext.hxx | 11 ---
xmloff/source/xforms/TokenContext.hxx | 10 --
xmloff/source/xforms/XFormsBindContext.hxx | 11 ---
xmloff/source/xforms/XFormsInstanceContext.hxx | 12 ---
xmloff/source/xforms/XFormsModelContext.hxx | 10 --
xmloff/source/xforms/XFormsSubmissionContext.hxx | 11 ---
xmlsecurity/source/helper/xsecctl.hxx | 2
99 files changed, 51 insertions(+), 651 deletions(-)
New commits:
commit d1ca0f4ed0e30394ce6759a20d4896651dd43051
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 05:32:26 2015 +0300
Bin some pointless comments and reduce some vertical whitespace
Bin pointless '// predeclarations' or '// forward declarations' comments. If
a programmer doesn't know what a forward declaration is, well, why read C++
source code?
Also bin some pointless '// end of namespace foo' comments after namespace
blocks just a handful of lines long, and some superfluous vertical whitespace.
Change-Id: I2a31c5d73d9b4de8825fb8eb9e7559dbd7303ef9
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 8dc2397..2bfb03a 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -27,19 +27,17 @@
#include <boost/scoped_ptr.hpp>
-// predeclarations
class CanvasSettings;
class SvtOptionsDrawinglayer;
+
namespace vcl {
-class IconThemeInfo;
+ class IconThemeInfo;
}
namespace svt {
class OpenGLCfg;
}
-// class OfaMiscTabPage --------------------------------------------------
-
class OfaMiscTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
@@ -83,7 +81,6 @@ public:
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
-// class OfaViewTabPage --------------------------------------------------
class SvtTabAppearanceCfg;
class OfaViewTabPage : public SfxTabPage
@@ -142,6 +139,7 @@ public:
};
struct LanguageConfig_Impl;
+
class OfaLanguagesTabPage : public SfxTabPage
{
VclPtr<ListBox> m_pUserInterfaceLB;
@@ -185,7 +183,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
-#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 61039e8..8c8ab55 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -75,7 +75,6 @@ namespace
static const char C_AND[] = " AND ";
static const char C_OR[] = " OR ";
- // forward declarations
bool InsertJoin( const OQueryDesignView* _pView,
const ::connectivity::OSQLParseNode *pNode);
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 2135344..336ba19 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -32,7 +32,6 @@
#include <vector>
-// forward declaration
class EnumFormatEtc;
/*--------------------------------------------------------------------------
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index fd07fc8..7fdb212 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -33,7 +33,6 @@
#include <map>
-// forward declarations for method arguments
namespace com { namespace sun { namespace star { namespace uno {
class Any;
class RuntimeException;
diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx
index b2675dc..045c636 100644
--- a/forms/source/xforms/unohelper.hxx
+++ b/forms/source/xforms/unohelper.hxx
@@ -21,23 +21,23 @@
#include <sal/types.h>
-// forward declarations
namespace com { namespace sun { namespace star {
namespace uno {
class XInterface;
template<class T> class Reference;
}
- namespace beans { class XPropertySet; }
+ namespace beans {
+ class XPropertySet;
+ }
} } }
-
namespace xforms
{
/** copy the properties from one PropertySet into the next */
void copy( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& , com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& );
-} // namespace
+}
#endif
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 2f0d39d..db68ae4 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -33,18 +33,8 @@
#include "FilterHelper.hxx"
#include "AquaFilePickerDelegate.hxx"
-
// Implementation class for the XFilePicker Interface
-
-
-// forward declarations
-
-
-
-// class declaration
-
-
typedef ::cppu::WeakComponentImplHelper4 <
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
@@ -60,29 +50,23 @@ public:
// constructor
SalAquaFilePicker();
-
// XFilePickerNotifier
-
virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
// XExecutableDialog functions
-
virtual void SAL_CALL setTitle( const OUString& aTitle )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL execute( )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
// XFilePicker functions
-
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
@@ -99,10 +83,8 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
// XFilterManager functions
-
virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
@@ -112,17 +94,13 @@ public:
virtual OUString SAL_CALL getCurrentFilter( )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
// XFilterGroupManager functions
-
virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
// XFilePickerControlAccess functions
-
virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue )
throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
@@ -138,32 +116,24 @@ public:
virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
// XInitialization
-
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
// XCancellable
-
virtual void SAL_CALL cancel( )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
// XEventListener
-
using cppu::WeakComponentImplHelperBase::disposing;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
throw(::com::sun::star::uno::RuntimeException);
-
// XServiceInfo
-
virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
@@ -173,10 +143,8 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
// FilePicker Event functions
-
void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
// OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index bd6fc8f..befe27d 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -34,20 +34,10 @@
#include <memory>
-
// Implementation class for the XFilePicker Interface
-
-
-// forward declarations
-
-
class CWinFileOpenImpl;
-
-// class declaration
-
-
class CFilePickerDummy
{
protected:
@@ -72,29 +62,23 @@ public:
// ctor
CFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
-
// XFilePickerNotifier
-
virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
-
// XExecutableDialog functions
-
virtual void SAL_CALL setTitle( const OUString& aTitle )
throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute( )
throw( ::com::sun::star::uno::RuntimeException );
-
// XFilePicker functions
-
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
throw( ::com::sun::star::uno::RuntimeException );
@@ -110,16 +94,13 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( )
throw( ::com::sun::star::uno::RuntimeException );
-
// XFilePicker2 functions
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles( )
throw (::com::sun::star::uno::RuntimeException);
-
// XFilterManager functions
-
virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -129,17 +110,13 @@ public:
virtual OUString SAL_CALL getCurrentFilter( )
throw( ::com::sun::star::uno::RuntimeException );
-
// XFilterGroupManager functions
-
virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
// XFilePickerControlAccess functions
-
virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue )
throw (::com::sun::star::uno::RuntimeException);
@@ -155,10 +132,8 @@ public:
virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw (::com::sun::star::uno::RuntimeException);
-
// XFilePreview
-
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (::com::sun::star::uno::RuntimeException);
@@ -173,31 +148,23 @@ public:
virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException);
-
// XInitialization
-
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
// XCancellable
-
virtual void SAL_CALL cancel( )
throw(::com::sun::star::uno::RuntimeException);
-
// XEventListener
-
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
throw(::com::sun::star::uno::RuntimeException);
-
// XServiceInfo
-
virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
@@ -207,10 +174,8 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
-
// FilePicker Event functions
-
void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 8c2f6ce..fd17c3f 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -37,7 +37,6 @@
#include <vector>
#include <osl/conditn.hxx>
-// forward declaration
class CFilePicker;
class CFilePickerState;
class CExecuteFilePickerState;
@@ -55,16 +54,12 @@ public:
virtual ~CWinFileOpenImpl( );
-
// XExecutableDialog
-
virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException );
-
// XFilePicker
-
virtual void SAL_CALL setDefaultName( const OUString& aName )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -76,10 +71,8 @@ public:
virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException );
-
// XFilterManager
-
virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -89,17 +82,13 @@ public:
virtual OUString SAL_CALL getCurrentFilter( )
throw( ::com::sun::star::uno::RuntimeException );
-
// XFilterGroupManager
-
virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
// XFilePickerControlAccess
-
virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue )
throw( ::com::sun::star::uno::RuntimeException );
@@ -115,10 +104,8 @@ public:
virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw ( ::com::sun::star::uno::RuntimeException);
-
// XFilePreview
-
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( )
throw (::com::sun::star::uno::RuntimeException);
@@ -140,16 +127,12 @@ public:
virtual sal_Bool SAL_CALL getShowState( )
throw (::com::sun::star::uno::RuntimeException);
-
// XCancelable
-
virtual void SAL_CALL cancel( );
-
// Implementation details
-
protected:
sal_Int16 SAL_CALL getFocused( );
@@ -169,7 +152,6 @@ protected:
virtual sal_uInt32 SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode );
-
void onWMSize();
void onWMShow(sal_Bool bShow);
void onWMWindowPosChanged();
@@ -212,7 +194,6 @@ private:
CResourceProvider m_ResProvider;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index 742cc7a..868d21e 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -28,16 +28,8 @@
#pragma warning(pop)
#endif
-
-// forward declaration
-
-
class CCustomControl;
-
-
-
-
class CCustomControlFactory
{
public:
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index dc40889..9c813eb 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -35,10 +35,8 @@
#endif
#include <memory>
-// forward declaration
class CPreviewAdapterImpl;
-
// A kind of a facade for the preview class.
// We want to hide the fact that the preview
// window may only become visible if there is
@@ -47,7 +45,6 @@ class CPreviewAdapterImpl;
// the preview active with a valid parent
// window the preview may not be visible
-
class CPreviewAdapter
{
public:
@@ -95,7 +92,6 @@ private:
CPreviewAdapter& operator=(const CPreviewAdapter&);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 2428b19..2bdd420 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -26,15 +26,10 @@
#include <vector>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
namespace com { namespace sun { namespace star { namespace rendering {
class XGraphicDevice;
}}}}
-
-
namespace basegfx
{
/** Base Color class with three double values
diff --git a/include/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx
index fb781cb..bde5318 100644
--- a/include/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
@@ -24,15 +24,10 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
namespace basegfx
{
class B2DPolygon;
-} // end of namespace basegfx
-
-
+}
namespace basegfx
{
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index 6fec4ad..cf5c7a3 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -25,11 +25,6 @@
#include <basegfx/color/bcolor.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
-
-
namespace basegfx
{
class BASEGFX_DLLPUBLIC BPixel
diff --git a/include/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx
index 9c5e35a..6d20188 100644
--- a/include/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
@@ -28,7 +28,6 @@
namespace basegfx
{
- // predeclaration
class B2DHomMatrix;
/** Base Point class with two double values
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 58c1ef7..5c47774 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -25,7 +25,6 @@
namespace basegfx
{
- // predeclaration
class B2DHomMatrix;
/** Base Point class with two sal_Int32 values
diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index 7484c7d..ef5c643 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -25,7 +25,6 @@
namespace basegfx
{
- // predeclaration
class B3DHomMatrix;
/** Base Point class with three double values
diff --git a/include/basegfx/point/b3ipoint.hxx b/include/basegfx/point/b3ipoint.hxx
index 08f1f09..dcd2906 100644
--- a/include/basegfx/point/b3ipoint.hxx
+++ b/include/basegfx/point/b3ipoint.hxx
@@ -25,7 +25,6 @@
namespace basegfx
{
- // predeclaration
class B3DHomMatrix;
/** Base Point class with three sal_Int32 values
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index da88050..1ca11b2 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -28,7 +28,6 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/basegfxdllapi.h>
-// predeclarations
class ImplB2DPolygon;
namespace basegfx
@@ -38,7 +37,7 @@ namespace basegfx
class B2DVector;
class B2DHomMatrix;
class B2DCubicBezier;
-} // end of namespace basegfx
+}
namespace basegfx
{
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx
index 07bffcd..3527c84 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -29,13 +29,12 @@
#include <basegfx/basegfxdllapi.h>
#include <basegfx/polygon/b2dpolygon.hxx>
-// predeclarations
class ImplB2DPolyPolygon;
namespace basegfx
{
class B2DHomMatrix;
-} // end of namespace basegfx
+}
namespace basegfx
{
diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 17ab965..58a4c0c 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -24,8 +24,6 @@
#include <o3tl/cow_wrapper.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
class ImplB3DPolygon;
namespace basegfx
@@ -37,9 +35,7 @@ namespace basegfx
class B2DPoint;
class B2DHomMatrix;
class BColor;
-} // end of namespace basegfx
-
-
+}
namespace basegfx
{
diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx
index 3ca1e10..040990f 100644
--- a/include/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
@@ -24,7 +24,6 @@
#include <o3tl/cow_wrapper.hxx>
#include <basegfx/basegfxdllapi.h>
-// predeclarations
class ImplB3DPolyPolygon;
namespace basegfx
@@ -32,9 +31,7 @@ namespace basegfx
class B3DPolygon;
class B3DHomMatrix;
class B2DHomMatrix;
-} // end of namespace basegfx
-
-
+}
namespace basegfx
{
diff --git a/include/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx
index 0769001..4d65879 100644
--- a/include/basegfx/range/b2drange.hxx
+++ b/include/basegfx/range/b2drange.hxx
@@ -31,7 +31,6 @@
namespace basegfx
{
- // predeclarations
class B2IRange;
class B2DHomMatrix;
diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index ea0b2e8..cf96c16 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -28,7 +28,6 @@
namespace basegfx
{
- // predeclarations
class B3IRange;
class B3DHomMatrix;
diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx
index df275e7..6f2b21b 100644
--- a/include/basegfx/raster/bpixelraster.hxx
+++ b/include/basegfx/raster/bpixelraster.hxx
@@ -26,11 +26,6 @@
#include <basegfx/pixel/bpixel.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
-
-
namespace basegfx
{
class BPixelRaster
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index d21f316..cddca21 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -23,11 +23,6 @@
#include <basegfx/raster/bpixelraster.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
-
-
namespace basegfx
{
class BZPixelRaster : public BPixelRaster
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 1004a2b..090258b 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -31,16 +31,12 @@
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/basegfxdllapi.h>
-
-// predeclarations
-
namespace basegfx
{
class B3DPolygon;
class B3DPolyPolygon;
}
-
// interpolators for double precision
namespace basegfx
@@ -446,8 +442,6 @@ namespace basegfx
};
} // end of namespace basegfx
-
-
#endif // INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index 91df59c..a00b57b 100644
--- a/include/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
@@ -27,7 +27,6 @@
namespace basegfx
{
- // predeclarations
class B2ITuple;
/** Base class for all Points/Vectors with two double values
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index bd98c1c..85df698 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -27,7 +27,6 @@
namespace basegfx
{
- // predeclarations
class B3ITuple;
/** Base class for all Points/Vectors with three double values
diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index 4b95987..364a4dd 100644
--- a/include/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
@@ -27,7 +27,6 @@
namespace basegfx
{
- // predeclaration
class B2DHomMatrix;
/** Base Point class with two double values
diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index 1fdeeb4..9c5b516 100644
--- a/include/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
@@ -28,7 +28,6 @@
namespace basegfx
{
- // predeclaration
class B2DHomMatrix;
/** Base Point class with two sal_Int32 values
diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx
index cef199f..8a8997b 100644
--- a/include/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
@@ -23,11 +23,8 @@
#include <basegfx/tuple/b3dtuple.hxx>
#include <basegfx/basegfxdllapi.h>
-
-
namespace basegfx
{
- // predeclaration
class B3DHomMatrix;
/** Base Point class with three double values
@@ -315,8 +312,6 @@ namespace basegfx
}
} // end of namespace basegfx
-
-
#endif // INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx
index cbc1db7..01a16f7 100644
--- a/include/basegfx/vector/b3ivector.hxx
+++ b/include/basegfx/vector/b3ivector.hxx
@@ -25,7 +25,6 @@
namespace basegfx
{
- // predeclaration
class B3DHomMatrix;
/** Base Point class with three sal_Int32 values
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 2c6f159..e8eb5e2 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -24,18 +24,13 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/comphelperdllapi.h>
-// forward declaration
namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessible;
class XAccessibleContext;
}}}}
-
namespace comphelper
{
-
-
-
//= OAccessibleImplementationAccess
typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XUnoTunnel
@@ -109,7 +104,6 @@ namespace comphelper
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent
);
-
/** sets the parent for a derived implementation
@param _rxComponent
@@ -125,17 +119,12 @@ namespace comphelper
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewParent
);
-
private:
COMPHELPER_DLLPRIVATE static const ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
};
-
-} // namespace comphelper
-
-
+} // namespace comphelper
#endif // INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index ebd06b1..7eecd27 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
-// forward declarations
namespace com
{
namespace sun
@@ -64,11 +63,8 @@ namespace com
}
}
-
namespace dbtools
{
-
-
namespace DBTypeConversion
{
OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date getStandardDate();
@@ -197,9 +193,7 @@ namespace dbtools
);
}
-
-} // namespace dbtools
-
+} // namespace dbtools
#endif // INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index ad6ede7..691cedd 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -31,7 +31,6 @@
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
-// forward declarations
namespace com
{
namespace sun
@@ -108,7 +107,6 @@ namespace connectivity
~SQLParseNodeParameter();
};
-
//= OSQLParseNode
class OOO_DLLPUBLIC_DBTOOLS OSQLParseNode
@@ -443,7 +441,6 @@ namespace connectivity
void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
};
-
inline OSQLParseNode* OSQLParseNode::getChild(sal_uInt32 nPos) const
{
assert(nPos < m_aChildren.size());
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index a02d884..5e4efe4 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -34,7 +34,6 @@
#include <map>
-// forward declarations
namespace com
{
namespace sun
@@ -56,12 +55,12 @@ namespace com
}
}
}
+
namespace connectivity
{
class OSQLScanner;
class SQLError;
-
//= OParseContext
class OOO_DLLPUBLIC_DBTOOLS OParseContext : public IParseContext
@@ -88,7 +87,6 @@ namespace connectivity
virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const SAL_OVERRIDE;
};
-
// OSQLParseNodesContainer
// grabage collection of nodes
@@ -108,7 +106,6 @@ namespace connectivity
typedef salhelper::SingletonRef<OSQLParseNodesContainer> OSQLParseNodesGarbageCollector;
-
//= OSQLParser
struct OSQLParser_Data
@@ -240,12 +237,10 @@ namespace connectivity
sal_Int16 buildLikeRule(OSQLParseNode* pAppend, OSQLParseNode*& pLiteral, const OSQLParseNode* pEscape);
sal_Int16 buildStringNodes(OSQLParseNode*& pLiteral);
-#else
#endif
};
}
-
#endif // INCLUDED_CONNECTIVITY_SQLPARSE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index d33ee9e..d996fb9 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -25,9 +25,6 @@
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/primitive2d/textenumsprimitive2d.hxx>
-
-// predeclarations
-
namespace basegfx { namespace tools {
class B2DHomMatrixBufferedOnDemandDecompose;
}}
@@ -36,8 +33,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
struct Boundary;
}}}}
-
-
namespace drawinglayer
{
namespace primitive2d
@@ -140,8 +135,6 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
-
-
#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx
index fb10ad3..5385582 100644
--- a/include/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/include/drawinglayer/processor2d/canvasprocessor.hxx
@@ -32,9 +32,6 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <vcl/mapmod.hxx>
-
-// forward declaration
-
namespace basegfx {
class BColor;
class B2DPolygon;
@@ -56,8 +53,6 @@ namespace drawinglayer { namespace primitive2d {
class UnifiedTransparencePrimitive2D;
}}
-
-
namespace drawinglayer
{
namespace processor2d
@@ -115,8 +110,6 @@ namespace drawinglayer
} // end of namespace processor2d
} // end of namespace drawinglayer
-
-
#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index e06f006..2b6419d 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -24,15 +24,10 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-
-// predeclarations
-
namespace basegfx { class B2DPolygon; }
namespace basegfx { class B2DPolyPolygon; }
namespace drawinglayer { namespace primitive2d { class ScenePrimitive2D; }}
-
-
namespace drawinglayer
{
namespace processor2d
@@ -105,8 +100,6 @@ namespace drawinglayer
} // end of namespace processor2d
} // end of namespace drawinglayer
-
-
#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
index b3302a6..6f759fa 100644
--- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
+++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
@@ -23,17 +23,12 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/drawinglayerdllapi.h>
-
-// predeclarations
-
class OutputDevice;
namespace drawinglayer { namespace processor2d {
class BaseProcessor2D;
}}
-
-
namespace drawinglayer
{
namespace processor2d
@@ -48,8 +43,6 @@ namespace drawinglayer
} // end of namespace processor2d
} // end of namespace drawinglayer
-
-
#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index 2068218..9a033c7 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
@@ -25,15 +25,10 @@
#include <drawinglayer/texture/texture.hxx>
#include <vcl/bitmapex.hxx>
-
-// predeclarations
-
namespace drawinglayer { namespace primitive3d {
class HatchTexturePrimitive3D;
}}
-
-
namespace drawinglayer
{
namespace texture
@@ -57,8 +52,6 @@ namespace drawinglayer
} // end of namespace texture
} // end of namespace drawinglayer
-
-
namespace drawinglayer
{
namespace texture
@@ -95,8 +88,6 @@ namespace drawinglayer
} // end of namespace texture
} // end of namespace drawinglayer
-
-
namespace drawinglayer
{
namespace texture
@@ -127,8 +118,6 @@ namespace drawinglayer
} // end of namespace texture
} // end of namespace drawinglayer
-
-
namespace drawinglayer
{
namespace texture
@@ -160,8 +149,6 @@ namespace drawinglayer
} // end of namespace texture
} // end of namespace drawinglayer
-
-
#endif // INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 7edf6ba..4cb339a 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -28,9 +28,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <framework/fwedllapi.h>
-// types, enums, ...
-
-
/*-************************************************************************************************************
@descr The method GetAddonsMenu() returns a list of property values.
Use follow defines to separate values by names.
@@ -49,7 +46,6 @@
namespace framework
{
-
struct FWE_DLLPUBLIC MergeMenuInstruction
{
OUString aMergePoint;
@@ -86,10 +82,6 @@ struct FWE_DLLPUBLIC MergeStatusbarInstruction
typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer;
-
-// forward declarations
-
-
/*-************************************************************************************************************
@short forward declaration to our private date container implementation
@descr We use these class as internal member to support small memory requirements.
@@ -106,15 +98,8 @@ class AddonsOptions_Impl;
class FWE_DLLPUBLIC AddonsOptions
{
-
- // public methods
-
-
public:
- // constructor / destructor
-
-
/*-****************************************************************************************************
@short standard constructor and destructor
@descr This will initialize an instance with default values.
@@ -129,10 +114,6 @@ class FWE_DLLPUBLIC AddonsOptions
AddonsOptions();
~AddonsOptions();
-
- // interface
-
-
/*-****************************************************************************************************
@short clears completely the addons menu
@descr Call this methods to clear the addons menu
@@ -261,10 +242,6 @@ class FWE_DLLPUBLIC AddonsOptions
*//*-*****************************************************************************************************/
DECL_STATIC_LINK( AddonsOptions, Notify, void* );
-
- // private member
-
-
private:
/*Attention
@@ -278,7 +255,7 @@ class FWE_DLLPUBLIC AddonsOptions
static AddonsOptions_Impl* m_pDataContainer ;
static sal_Int32 m_nRefCount ;
-}; // class SvtMenuOptions
+};
}
diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx
index a5bcc98..cad738c 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -26,10 +26,6 @@
#include <rtl/ustring.hxx>
#include <tools/color.hxx>
-
-// forward declarations
-
-
/*-************************************************************************************************************
@short forward declaration to our private date container implementation
@descr We use these class as internal member to support small memory requirements.
@@ -46,16 +42,8 @@ class SvtOptionsDrawinglayer_Impl;
class SVT_DLLPUBLIC SvtOptionsDrawinglayer
{
-
- // public methods
-
-
public:
-
- // constructor / destructor
-
-
/*-****************************************************************************************************
@short standard constructor and destructor
@descr This will initialize an instance with default values.
@@ -70,10 +58,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
SvtOptionsDrawinglayer();
~SvtOptionsDrawinglayer();
-
- // interface
-
-
/*-****************************************************************************************************
@short interface methods to get and set value of config key "org.openoffice.Office.Common/Drawinglayer/..."
@descr These options describe internal states to enable/disable features of installed office.
@@ -149,10 +133,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
void SetTransparentSelection( bool bState );
void SetTransparentSelectionPercent( sal_uInt16 nPercent );
-
- // private methods
-
-
private:
/*-****************************************************************************************************
@@ -163,12 +143,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
*//*-*****************************************************************************************************/
SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
-
- // private member
-
-
- private:
-
/*Attention
Don't initialize these static members in these headers!
@@ -180,7 +154,7 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
static SvtOptionsDrawinglayer_Impl* m_pDataContainer ;
static sal_Int32 m_nRefCount ;
-}; // class SvtOptionsDrawinglayer
+};
#endif // #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index 54e5dcc..457948c 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -22,16 +22,13 @@
#include <svx/svxdllapi.h>
-
-// predeclarations
-
class SdrObject;
class E3dScene;
+
namespace drawinglayer { namespace geometry {
class ViewInformation3D;
}}
-
// This class is a helper to encapsulate 3D object changes which shall change the
// scene's 2D geometry. E.g. when moving one 3D object in a scene, the visualisation
// would not change since the scene's 2D attributes are defined by it's 2D object
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 636315f..cf76fe8 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -25,18 +25,13 @@
#include <svx/sdr/animation/scheduler.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-// predeclarations
-
namespace sdr
{
namespace contact
{
class ViewObjectContact;
} // end of namespace contact
-} // end of namespace sdr
-
-
+}
namespace sdr
{
@@ -68,8 +63,6 @@ namespace sdr
} // end of namespace animation
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index e4def23..4d9d704 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -23,7 +23,6 @@
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <boost/optional.hpp>
-// predeclarations
class SdrObject;
class SetOfByte;
class OutputDevice;
@@ -62,8 +61,6 @@ public:
}}
-
-
#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index c6c0334..9fdb9de 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -32,9 +32,6 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <salhelper/simplereferenceobject.hxx>
-
-// predeclarations
-
class OutputDevice;
class SdrModel;
namespace vcl { class Region; }
@@ -47,8 +44,6 @@ namespace basegfx {
class B2DRange;
}
-
-
namespace sdr
{
namespace overlay
@@ -147,8 +142,6 @@ namespace sdr
} // end of namespace overlay
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 167114e..ee7aad6 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -30,9 +30,6 @@
#include <vector>
-
-// predeclarations
-
class OutputDevice;
namespace sdr
@@ -41,16 +38,14 @@ namespace sdr
{
class OverlayManager;
} // end of namespace overlay
-} // end of namespace sdr
+}
namespace basegfx
{
class B2DPolygon;
class B2DPolyPolygon;
class B2DRange;
-} // end of namespace basegfx
-
-
+}
namespace sdr
{
@@ -172,8 +167,6 @@ namespace sdr
} // end of namespace overlay
} // end of namespace sdr
-
-
namespace sdr
{
namespace overlay
@@ -195,8 +188,6 @@ namespace sdr
} // end of namespace overlay
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index d25970d..efdcbdc 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -23,9 +23,6 @@
#include <sal/types.h>
#include <svx/svxdllapi.h>
-
-// predeclarations
-
class SdrObject;
class SfxItemSet;
class SfxPoolItem;
@@ -39,10 +36,8 @@ namespace sdr
namespace properties
{
class ItemChangeBroadcaster;
- } // end of namespace properties
-} // end of namespace sdr
-
-
+ }
+}
namespace sdr
{
@@ -187,8 +182,6 @@ namespace sdr
} // end of namespace properties
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index 92da6c4..eec99df 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -23,8 +23,6 @@
#include <svx/sdrpageuser.hxx>
#include <svx/svdsob.hxx>
-
-// predeclarations
class SdrObject;
class SfxItemSet;
class SdrPageProperties;
@@ -35,9 +33,7 @@ namespace sdr
{
class ViewContact;
} // end of namespace contact
-} // end of namespace sdr
-
-
+}
namespace sdr
{
@@ -86,8 +82,6 @@ namespace sdr
};
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx
index b480257..78db4ff 100644
--- a/include/svx/sdrobjectuser.hxx
+++ b/include/svx/sdrobjectuser.hxx
@@ -22,11 +22,8 @@
#include <vector>
-
-// predeclarations
class SdrObject;
-
// To make things more safe, allow users of an object to register at it. The users need to be derived
// from sdr::ObjectUser to get a call. The users do not need to call RemoveObjectUser() at the page
// when they get called from ObjectInDestruction().
@@ -49,8 +46,6 @@ namespace sdr
typedef ::std::vector< ObjectUser* > ObjectUserVector;
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDROBJECTUSER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx
index d4eae04..9754a1a 100644
--- a/include/svx/sdrpageuser.hxx
+++ b/include/svx/sdrpageuser.hxx
@@ -22,11 +22,8 @@
#include <vector>
-
-// predeclarations
class SdrPage;
-
// To make things more safe, allow users of the page to register at it. The users need to be derived
// from sdr::PageUser to get a call. The users do not need to call RemovePageUser() at the page
// when they get called from PageInDestruction().
@@ -49,8 +46,6 @@ namespace sdr
typedef ::std::vector< PageUser* > PageUserVector;
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_SDRPAGEUSER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 05e1aa6..51303d2 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -27,8 +27,6 @@
#include <com/sun/star/awt/XControlContainer.hpp>
-// predeclarations
-
namespace vcl { class Region; }
namespace sdr
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index d8f0918..d079da8 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -24,8 +24,6 @@
#include <vcl/virdev.hxx>
#include <svx/svxdllapi.h>
-
-// predeclarations
class SdrPaintView;
namespace sdr
@@ -33,20 +31,18 @@ namespace sdr
namespace overlay
{
class OverlayManager;
- } // end of namespace overlay
-} // end of namespace sdr
+ }
+}
#ifdef _MSC_VER // broken msvc template instantiation
#include <svx/sdr/overlay/overlaymanager.hxx>
#endif
-
/// paint the transparent children of rWin that overlap rPixelRect
/// (for example, transparent form controls like check boxes)
void SVX_DLLPUBLIC
PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect);
-
class SdrPreRenderDevice
{
// The original OutputDevice
@@ -66,8 +62,6 @@ public:
OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice.get(); }
};
-
-
class SVX_DLLPUBLIC SdrPaintWindow
{
private:
@@ -150,8 +144,6 @@ public:
// typedefs for a list of SdrPaintWindows
typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector;
-
-
#endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 74b5a18..844105d 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -35,8 +35,6 @@
#include <tools/mapunit.hxx>
#include <tools/gen.hxx>
-// forward declarations
-
class SfxBroadcaster;
class Pointer;
class AutoTimer;
@@ -97,15 +95,13 @@ namespace sdr
{
class ViewContact;
} // end of namespace contact
-} // end of namespace sdr
+}
namespace svx
{
class PropertyChangeNotifier;
}
-// Defines
-
enum SdrObjKind {
OBJ_NONE = 0, /// abstract object (SdrObject)
OBJ_GRUP = 1, /// object group
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 7c0a8d2..224dcb7 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -29,8 +29,6 @@
#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
-// forward declarations
-
class SvtViewOptionsBase_Impl;
/*-************************************************************************************************************
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index b957022..8ba3969 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -146,9 +146,6 @@ typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector;
/** a map to store all cache data for already collected XShapes */
typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos;
-
-// predeclarations
-
class SvXMLExport;
class SvXMLExportPropertyMapper;
@@ -156,7 +153,7 @@ namespace basegfx
{
class B2DTuple;
class B2DHomMatrix;
-} // end of namespace basegfx
+}
class XMLOFF_DLLPUBLIC XMLShapeExport : public salhelper::SimpleReferenceObject
{
@@ -328,7 +325,6 @@ public:
const rtl::Reference< XMLTableExport >& GetShapeTableExport();
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index 82e6d24..447bf88 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -42,10 +42,6 @@
#include <xmloff/xmlprmap.hxx>
#include <xmloff/xmlexppr.hxx>
-
-
-// predeclarations
-
class SvXMLExport;
class SvXMLExportPropertyMapper;
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 3726eb2..853af45 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -26,8 +26,6 @@
#include <vector>
-
-
// masks for the error ID fields
#define XMLERROR_MASK_FLAG 0xF0000000
#define XMLERROR_MASK_CLASS 0x00FF0000
@@ -44,7 +42,6 @@
#define XMLERROR_CLASS_API 0x00040000
#define XMLERROR_CLASS_OTHER 0x00080000
-
// error numbers, listed by error class
// Within each class, errors should be numbered consecutively. Please
// always add to error code below the appropriate comment.
@@ -76,8 +73,6 @@
// other errors:
#define XMLERROR_CANCEL ( XMLERROR_CLASS_OTHER | 0x00000001 )
-
-
// 16bit error flag constants for use in the
// SvXMLExport/SvXMLImport error flags
enum class SvXMLErrorFlags {
@@ -86,22 +81,19 @@ enum class SvXMLErrorFlags {
ERROR_OCCURRED = 0x0002,
WARNING_OCCURRED = 0x0004,
};
+
namespace o3tl
{
template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {};
}
-
-
-// forward declarations
namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Sequence; }
namespace uno { template<class X> class Reference; }
namespace xml { namespace sax { class XLocator; } }
} } }
-class ErrorRecord;
-
+class ErrorRecord;
/**
* The XMLErrors is used to collect all errors and warnings that occur
@@ -146,7 +138,6 @@ public:
throw( ::com::sun::star::xml::sax::SAXParseException );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 66698fa..94f8c43 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -40,9 +40,6 @@
#include <tools/fldunit.hxx>
#include <tools/mapunit.hxx>
-
-// predeclarations
-
namespace tools { class Time; }
namespace com { namespace sun { namespace star {
@@ -53,7 +50,7 @@ namespace com { namespace sun { namespace star {
namespace basegfx
{
class B3DVector;
-} // end of namespace basegfx
+}
class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
{
@@ -224,7 +221,6 @@ public:
/** convert number (sal_uInt32) to string (hex) */
static void convertHex( OUStringBuffer& rBuffer,
sal_uInt32 nVal );
-
};
#endif // INCLUDED_XMLOFF_XMLUCONV_HXX
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 9d84b09..d9b48fe 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -71,12 +71,9 @@
using namespace linguistic;
using namespace ::com::sun::star;
-// forward declarations
static OUString GrammarCheckingIterator_getImplementationName() throw();
static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw();
-
-
// white space list: obtained from the fonts.config.txt of a Linux system.
static const sal_Unicode aWhiteSpaces[] =
{
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index c840b87..5271732 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -46,15 +46,12 @@
#include "thesdsp.hxx"
#include "gciterator.hxx"
-
using namespace com::sun::star;
using namespace linguistic;
-// forward declarations
uno::Sequence< OUString > static GetLangSvcList( const uno::Any &rVal );
uno::Sequence< OUString > static GetLangSvc( const uno::Any &rVal );
-
static bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText )
{
bool bRes = false;
@@ -2133,6 +2130,4 @@ void * SAL_CALL LngSvcMgr_getFactory(
return pRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx
index 84f9258..1d558da 100644
--- a/reportdesign/source/ui/inc/MarkedSection.hxx
+++ b/reportdesign/source/ui/inc/MarkedSection.hxx
@@ -24,7 +24,7 @@
namespace rptui
{
- class OSectionWindow; // forward declaration
+ class OSectionWindow;
enum NearSectionAccess
{
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index b68375b..8a43de4 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// TestWin32.cpp : Defines the entry point for the application.
-
#define _WIN32_DCOM
#include "stdafx.h"
@@ -39,7 +37,6 @@
#define MAX_LOADSTRING 100
-// Global variables:
HINSTANCE g_hInst; // current instance
HWND g_hwndMain;
WCHAR szTitle[MAX_LOADSTRING]; // Text for title
@@ -49,7 +46,6 @@ char* pTextBuff = NULL;
DWORD lData = 0;
UINT g_nCBChanges = 0;
-// forward declaration
ATOM MyRegisterClass( HINSTANCE hInstance );
BOOL InitInstance( HINSTANCE, int );
HMENU GetSubMenuHandle( HWND hwndParent, UINT uiTopLevelIndex );
@@ -63,8 +59,6 @@ void CALLBACK OnClipboardContentChange();
LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM );
LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM );
-// WinMain
-
int APIENTRY WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index 68c5812..bad8da1 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -27,16 +27,11 @@
// Platform: Windows 2000, Windows XP
//+-------------------------------------------------------------------------
-// forward declaration
class CContentReader;
class CMetaInfoReader;
class CFullPropSpec;
-//+-------------------------------------------------------------------------
-// Global definitions
-
-
long g_lInstances = 0; // Global count of COooFilter and COooFilterCF instances
GUID const guidStorage = PSGUID_STORAGE; // GUID for storage property set
@@ -44,7 +39,6 @@ GUID const guidStorage = PSGUID_STORAGE; // GUID for storage property set
// Class: COooFilter
// Purpose: Implements interfaces of LibreOffice filter
-
// OooFilter Class ID
// {7BC0E710-5703-45be-A29D-5D46D8B39262}
GUID const CLSID_COooFilter =
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index ba3f5af..21b7587 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -23,14 +23,9 @@
#include <svx/sdr/contact/objectcontact.hxx>
#include <vcl/idle.hxx>
-
-// predeclarations
-
class SdrPageWindow;
class SdrPage;
-
-
namespace sdr
{
namespace contact
@@ -138,8 +133,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
index 5655206..d3657e5 100644
--- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
@@ -24,14 +24,9 @@
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
#include <svx/svdograf.hxx>
-
-// predeclarations
-
namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }}
class GraphicAttr;
-
-
namespace sdr
{
namespace contact
@@ -82,8 +77,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index ebe53f7..296d127 100644
--- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -24,14 +24,10 @@
#include <svx/sdr/contact/viewcontact.hxx>
#include <svx/sdrmasterpagedescriptor.hxx>
-
-// predeclarations
class SfxItemSet;
class Bitmap;
class MapMode;
-
-
namespace sdr
{
namespace contact
@@ -70,8 +66,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index 56276f1..0781313 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -23,15 +23,10 @@
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-
-// predeclarations
-
namespace sdr { namespace contact {
class ViewObjectContactOfE3dScene;
}}
-
-
namespace sdr
{
namespace contact
@@ -67,8 +62,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
index a78ba0f..14e472a 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -22,16 +22,12 @@
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-// predeclarations
class SdrGrafObj;
namespace sdr { namespace event {
class AsynchGraphicLoadingEvent;
}}
-
-
namespace sdr
{
namespace contact
@@ -67,8 +63,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
index 19e60f5..ba37bee 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx
@@ -22,11 +22,6 @@
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-// predeclarations
-
-
-
namespace sdr
{
namespace contact
@@ -47,8 +42,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 5f6aed6..2a6e179 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -22,15 +22,10 @@
#include <svx/sdr/contact/viewobjectcontact.hxx>
-
-// predeclarations
-
namespace sdr {
class MasterPageDescriptor;
}
-
-
namespace sdr
{
namespace contact
@@ -50,8 +45,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
index ca462f4..d0dd9ab 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -22,13 +22,8 @@
#include <svx/sdr/contact/viewobjectcontact.hxx>
-
-// predeclarations
-
class SdrPage;
-
-
namespace sdr
{
namespace contact
@@ -48,8 +43,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -68,8 +61,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -86,8 +77,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -106,8 +95,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -123,8 +110,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -140,8 +125,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -157,8 +140,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -174,8 +155,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -194,8 +173,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -214,8 +191,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
namespace sdr
{
namespace contact
@@ -231,8 +206,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index d930e17..fbecdef 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -22,15 +22,11 @@
#include <sal/types.h>
-
-// predeclarations
-
class SdrObject;
class SfxItemSet;
class Rectangle;
class Fraction;
-
// class to remember broadcast start positions
namespace sdr
{
@@ -51,8 +47,6 @@ namespace sdr
} // end of namespace properties
} // end of namespace sdr
-
-
namespace sdr
{
namespace properties
@@ -61,8 +55,6 @@ namespace sdr
} // end of namespace properties
} // end of namespace sdr
-
-
#endif // INCLUDED_SVX_INC_SDR_PROPERTIES_ITEMSETTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index 1968327..972c990 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -24,10 +24,6 @@
#include <sal/config.h>
#include <svx/svxdllapi.h>
-
-// forward declaration
-
-
class ResMgr;
// Get the resource manager for the app
@@ -40,8 +36,6 @@ ResMgr* ImpGetResMgr();
// See also SvdStr.Hrc
SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
-
-
#endif // INCLUDED_SVX_INC_SVDGLOB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index c943b68..5d2efc9 100644
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.hxx
@@ -23,7 +23,6 @@
#include <sal/types.h>
-// predeclarations
class SdrObject;
// #i13033#
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
index 85bb776..42368b8 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sdr/contact/viewobjectcontactofe3d.hxx>
#include <svx/sdr/contact/viewcontactofe3d.hxx>
#include <basegfx/color/bcolor.hxx>
@@ -26,11 +25,6 @@
#include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx>
#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
-
-// predeclarations
-
-
-
namespace sdr
{
namespace contact
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index b49aa0e..e9daf6f 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -25,9 +25,6 @@
#include <svx/svddrgv.hxx>
#include <svx/svddrgmt.hxx>
-
-// predeclarations
-
class SdrDragView;
class SdrDragMovHdl : public SdrDragMethod
@@ -238,7 +235,6 @@ public:
virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
};
-
#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index 849400e..4c33259 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -23,11 +23,6 @@
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
#include <svx/svdotable.hxx>
-
-// predeclarations
-
-
-
namespace sdr
{
namespace contact
@@ -53,8 +48,6 @@ namespace sdr
} // end of namespace contact
} // end of namespace sdr
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f026587..71ab467 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -240,7 +240,6 @@ namespace sfx2 {
typedef boost::ptr_vector<SwPageDesc> SwPageDescs;
-// forward declaration
void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
// global function to start grammar checking in the document
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 843daeb..51bfb2e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -32,8 +32,6 @@
#include <memory>
#include <vector>
-// forward declarations
-
class SwCntntFrm;
class SwCntntNode;
class SwDoc;
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 3897356..579dd63 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -32,11 +32,8 @@
namespace fileaccess {
- // forward declaration
-
class shell;
-
class XInputStream_impl
: public cppu::OWeakObject,
public com::sun::star::lang::XTypeProvider,
@@ -149,8 +146,6 @@ namespace fileaccess {
sal_Int32 m_nErrorCode;
sal_Int32 m_nMinorErrorCode;
};
-
-
} // end namespace XInputStream_impl
#endif
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index ba0da71..30b51f3 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -46,8 +46,6 @@
using namespace psp;
-// forward declaration
-
#define nBLOCKSIZE 0x2000
namespace psp
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index a5e18d6..8c08b4a 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -42,14 +42,14 @@
* friends are PostScript afm style, that is they are 1/1000 font height
*/
-// forward declarations
-namespace utl { class MultiAtomProvider; } // see unotools/atom.hxx
+namespace utl { class MultiAtomProvider; }
+
class FontSubsetInfo;
class ImplFontOptions;
class FontSelectPattern;
namespace psp {
-class PPDParser; // see ppdparser.hxx
+class PPDParser;
namespace fonttype
{
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 348b44c..77ae365 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -30,7 +30,6 @@
namespace psp {
-// forwards
struct JobData;
/*
@@ -115,10 +114,6 @@ public:
}
};
-/*
- * forward declarations
- */
-
class Font2;
class GlyphSet;
class PrinterJob;
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 686c890..5282a37 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -28,13 +28,11 @@
namespace psp {
-// forward declarations
class PrinterGfx;
class PrinterJob
{
-private: // private data
-
+private:
OUString maSpoolDirName;
OUString maFileName; // empty: spool to command, else spool to named file
OUString maJobTitle;
@@ -70,8 +68,7 @@ private: // private data
bool m_bQuickJob;
-private: // private methods
-
+private:
osl::File* CreateSpoolFile (const OUString& rName,
const OUString& rExtension);
void InitPaperSize (const JobData& rJobSetup);
@@ -83,7 +80,6 @@ private: // private methods
static bool writeProlog (osl::File* pFile, const JobData& );
public: // for usage in PrinterGfx
-
sal_uInt32 GetResolution () const { return mnResolution; }
void GetScale (double &rXScale, double &rYScale) const;
sal_uInt16 GetDepth () const;
@@ -129,7 +125,7 @@ public:
bool EndPage ();
};
-} /* namespace psp */
+} // namespace psp
#endif // INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 7ccbe15..55d0d67 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -25,28 +25,22 @@
// We need this to enable namespace support in libgrengine headers.
#define GR_NAMESPACE
-// Standard Library
#include <memory>
#include <vector>
#include <map>
#include <utility>
-// Libraries
+
#include <graphite_static.hxx>
#include <graphite2/Font.h>
#include <graphite2/Segment.h>
-// Platform
+
#include <vcl/dllapi.h>
#include "sallayout.hxx"
-// Module
-
-// Module type definitions and forward declarations.
-// SAL/VCL types
class ServerFont;
class PhysicalFontFace;
-// Graphite types
namespace grutils { class GrFeatureParser; }
class GraphiteFaceWrapper
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index d26a15f..e7d54f4 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -29,9 +29,6 @@
// #define GRLAYOUT_DEBUG 1
-// Header files
-
-// Standard Library
#include <algorithm>
#include <cassert>
#include <functional>
@@ -39,7 +36,6 @@
#include <numeric>
#include <deque>
-// Platform
#include <config_global.h>
#include <svsys.h>
@@ -61,10 +57,6 @@
#include <graphite_layout.hxx>
#include <graphite_features.hxx>
-// Module private type definitions and forward declarations.
-
-// Module private names.
-
#ifdef GRLAYOUT_DEBUG
static FILE * grLog()
{
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index 92801ba..bbf91b0 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -31,15 +31,13 @@
namespace chelp {
- // forward declaration
-
class XInputStream_impl
: public cppu::OWeakObject,
public com::sun::star::io::XInputStream,
public com::sun::star::io::XSeekable
{
- public:
+ public:
XInputStream_impl( const OUString& aUncPath );
virtual ~XInputStream_impl();
@@ -125,7 +123,6 @@ namespace chelp {
com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
-
bool m_bIsOpen;
osl::File m_aFile;
};
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 2c8112a..3f9d42d 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -30,8 +30,6 @@
#include <vector>
-// predeclarations
-
struct ImpSdXMLExpTransObj2DBase;
struct ImpSdXMLExpTransObj3DBase;
class SvXMLUnitConverter;
@@ -43,7 +41,7 @@ namespace basegfx
class B2DTuple;
class B2DHomMatrix;
class B3DHomMatrix;
-} // end of namespace basegfx
+}
typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseList;
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 7d4e332..ee5574c 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -23,16 +23,12 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
@@ -42,20 +38,15 @@ class SchemaContext : public TokenContext
com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
public:
-
SchemaContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
virtual ~SchemaContext();
-
-
// implement TokenContext methods:
-
protected:
-
virtual void HandleAttribute(
sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index e55e945..04541cf 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -23,16 +23,12 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
@@ -45,7 +41,6 @@ class SchemaRestrictionContext : public TokenContext
OUString msBaseName;
public:
-
SchemaRestrictionContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
@@ -53,16 +48,12 @@ public:
const OUString& sTypeName );
virtual ~SchemaRestrictionContext();
-
protected:
-
// create mxDataType (if not already present)
void CreateDataType();
-
// implement TokenContext methods:
-
virtual void HandleAttribute(
sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index a84f4ce..3d0a390 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -23,16 +23,12 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
@@ -43,7 +39,6 @@ class SchemaSimpleTypeContext : public TokenContext
OUString msTypeName;
public:
-
SchemaSimpleTypeContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
@@ -51,13 +46,9 @@ public:
virtual ~SchemaSimpleTypeContext();
-
-
// implement TokenContext methods:
-
protected:
-
virtual void HandleAttribute(
sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 072174a..3357736 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -22,15 +22,11 @@
#include <xmloff/xmlictxt.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace uno { template<typename T> class Reference; }
} } }
+
class SvXMLImport;
#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN }
@@ -45,7 +41,6 @@ protected:
const SvXMLTokenMapEntry* mpChildren; /// static token map
public:
-
TokenContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -54,11 +49,8 @@ public:
virtual ~TokenContext();
-
-
// implement SvXMLImportContext methods:
-
/** call HandleAttribute for each attribute in the token map;
* create a warning for all others. Classes that wish to override
* StartElement need to call the parent method. */
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 4dec0e1..a00d8c2 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -23,20 +23,15 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
-
/** import the xforms:binding element */
class XFormsBindContext : public TokenContext
{
@@ -44,18 +39,14 @@ class XFormsBindContext : public TokenContext
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxBinding;
public:
-
XFormsBindContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
virtual ~XFormsBindContext();
-
-
// implement SvXMLImportContext & TokenContext methods:
-
virtual void StartElement(
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index a42b696..64a7663 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -23,21 +23,16 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace xml { namespace dom { class XDocument; } }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
-
/** import the xforms:instance element */
class XFormsInstanceContext : public TokenContext
{
@@ -47,21 +42,17 @@ class XFormsInstanceContext : public TokenContext
OUString msURL;
public:
-
XFormsInstanceContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel );
virtual ~XFormsInstanceContext();
-
-
// implement SvXMLImportContext & TokenContext methods:
// We override CreateChildContext, because we want to read
// arbitrary DOM elements. For the attributes, we use the
// TokenContext mechanism.
-
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -70,7 +61,6 @@ public:
virtual void EndElement() SAL_OVERRIDE;
protected:
-
virtual void HandleAttribute(
sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index b439c27..4247f02 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -24,15 +24,11 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xforms/XModel2.hpp>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
@@ -42,7 +38,6 @@ class XFormsModelContext : public TokenContext
com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
public:
-
XFormsModelContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName );
@@ -50,14 +45,11 @@ public:
com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel() { return mxModel;}
-
// implement SvXMLImportContext & TokenContext methods:
-
virtual void EndElement() SAL_OVERRIDE;
protected:
-
virtual void HandleAttribute(
sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 82c9292..0457f3a 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -23,38 +23,29 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-
-
-// forward declarations
-
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
} } }
+
class SvXMLImport;
class SvXMLImportContext;
-
/** import the xforms:submission element */
class XFormsSubmissionContext : public TokenContext
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxSubmission;
public:
-
XFormsSubmissionContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
virtual ~XFormsSubmissionContext();
-
-
// implement TokenContext methods:
-
protected:
virtual void HandleAttribute( sal_uInt16 nToken,
const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 348d2d5..196c698 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -108,7 +108,6 @@
#define INITIALIZED 1
#define FAILTOINITIALIZED 2
-// forward declaration
class XSecParser;
class InternalSignatureInformation
@@ -512,5 +511,4 @@ public:
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list