diff options
Diffstat (limited to 'include')
50 files changed, 24 insertions, 284 deletions
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx index 2428b19b521b..2bdd42063b6f 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 fb781cb4016c..bde53183f362 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 6fec4ad4ccaa..cf5c7a33df46 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 9c5e35a69271..6d2018814d53 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 58c1ef7b3c8e..5c4777436adc 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 7484c7ddec1d..ef5c643231c8 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 08f1f09c2f56..dcd290605b72 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 da88050c5238..1ca11b240316 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 07bffcd6527d..3527c84da811 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 17ab965a8bb6..58a4c0cf27eb 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 3ca1e10740ae..040990f66d21 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 07690017fa86..4d658799e685 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 ea0b2e82a7db..cf96c16bc26b 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 df275e7451a9..6f2b21b107e8 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 d21f316671ca..cddca2186578 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 1004a2b1fd96..090258b3681a 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 91df59c3ac6e..a00b57b8a75e 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 bd98c1cd294a..85df69879660 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 4b95987ddc89..364a4dd984e7 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 1fdeeb4ea13a..9c5b5165f527 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 cef199fc8913..8a8997b16fbc 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 cbc1db790189..01a16f752cf8 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 2c6f15979221..e8eb5e2897c4 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 ebd06b12dfda..7eecd2741f8e 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 ad6ede75355d..691cedd0e563 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 a02d884f6ef4..5e4efe41588f 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 d33ee9e56828..d996fb9b77e4 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 fb10ad339e0b..5385582330f5 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 e06f006bf479..2b6419d74b2f 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 b3302a6c1d53..6f759faf4916 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 2068218d5354..9a033c7422f4 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 7edf6baf3da1..4cb339a3089f 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 a5bcc98c7acd..cad738c68d3e 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 54e5dcc040e5..457948cea689 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 636315f1446f..cf76fe8cc091 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 e4def238c5ec..4d9d7049e88d 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 c6c0334d31b7..9fdb9de93cf0 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 167114eb66be..ee7aad6902c3 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 d25970d46976..efdcbdcb06e0 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 92da6c41d8c5..eec99df167bf 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 b480257fe274..78db4ffdbda7 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 d4eae047ac8b..9754a1a79a6a 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 05e1aa6f0d04..51303d21fe1d 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 d8f091885c95..d079da81f2e6 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 74b5a18ee290..844105db21dd 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 7c0a8d211886..224dcb7e94d8 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 b957022d5e0e..8ba396903136 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 82e6d240274c..447bf88bd37b 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 3726eb23a19d..853af45923af 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 66698fa05413..94f8c43f18b8 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 |