diff options
Diffstat (limited to 'include')
550 files changed, 0 insertions, 1494 deletions
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index f125d306b662..c14af2bc720b 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -84,7 +84,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert color to gray @@ -110,7 +109,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** invert color @@ -138,7 +136,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert to alpha based on luminance @@ -170,7 +167,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** replace color @@ -206,7 +202,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** interpolate color @@ -246,7 +241,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert color to black and white @@ -281,7 +275,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** gamma correction @@ -318,7 +311,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** Red, Green, Blue, Luminance and Contrast correction @@ -368,7 +360,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /// typedef to allow working with shared instances of BColorModifier @@ -416,7 +407,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx index 24efc70df476..2f4222f73040 100644 --- a/include/basegfx/color/bcolortools.hxx +++ b/include/basegfx/color/bcolortools.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { class BColor; diff --git a/include/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx index 24286d917295..e0630484221f 100644 --- a/include/basegfx/curve/b2dbeziertools.hxx +++ b/include/basegfx/curve/b2dbeziertools.hxx @@ -33,7 +33,6 @@ namespace basegfx } - namespace basegfx { class BASEGFX_DLLPUBLIC B2DCubicBezierHelper @@ -51,7 +50,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx index 41a17ec25583..f6b955ca2ab5 100644 --- a/include/basegfx/matrix/b2dhommatrixtools.hxx +++ b/include/basegfx/matrix/b2dhommatrixtools.hxx @@ -27,8 +27,6 @@ #include <basegfx/basegfxdllapi.h> - - namespace basegfx { namespace tools @@ -137,7 +135,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -176,7 +173,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -224,7 +220,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index 8b942bb06570..77cafdc6c8ef 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -28,7 +28,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx index a7b579fdb442..f50ac9e8f7f6 100644 --- a/include/basegfx/polygon/b2dpolygonclipper.hxx +++ b/include/basegfx/polygon/b2dpolygonclipper.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx index 89cf1012f075..0918e0e1d90d 100644 --- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools @@ -52,7 +51,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx index fb51facad2c2..423cf8f30ef4 100644 --- a/include/basegfx/polygon/b2dpolygontools.hxx +++ b/include/basegfx/polygon/b2dpolygontools.hxx @@ -32,7 +32,6 @@ #include <o3tl/typed_flags_set.hxx> - // Definitions for the cut flags used from the findCut methods enum class CutFlagValue { diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx index 9ea03a5dcaa8..d3e92a017d79 100644 --- a/include/basegfx/polygon/b2dpolygontriangulator.hxx +++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace triangulator diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx index 6afe54693178..b8bf5847dcc4 100644 --- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools @@ -146,8 +145,6 @@ namespace basegfx } // end of namespace basegfx - - #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx index 1c9a23b56252..2131c7d2f2d1 100644 --- a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx +++ b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx @@ -23,7 +23,6 @@ #include <sal/types.h> - namespace basegfx { /** Fill rule to use for poly-polygon filling. diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index f069bc8aa17b..07880e9c986e 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -31,8 +31,6 @@ #include <basegfx/basegfxdllapi.h> - - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx index f1f14134c5f8..41885cf894bb 100644 --- a/include/basegfx/polygon/b2dtrapezoid.hxx +++ b/include/basegfx/polygon/b2dtrapezoid.hxx @@ -26,7 +26,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // class to hold a single trapezoid @@ -74,7 +73,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -118,7 +116,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx index 486c1321fee8..6c9c9b9c0808 100644 --- a/include/basegfx/polygon/b3dpolygon.hxx +++ b/include/basegfx/polygon/b3dpolygon.hxx @@ -119,8 +119,6 @@ namespace basegfx } // end of namespace basegfx - - #endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx index d6e01ef05e7e..9a2291004cde 100644 --- a/include/basegfx/polygon/b3dpolygontools.hxx +++ b/include/basegfx/polygon/b3dpolygontools.hxx @@ -28,7 +28,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx index 1326ffbcb69a..afb4acf00e67 100644 --- a/include/basegfx/polygon/b3dpolypolygontools.hxx +++ b/include/basegfx/polygon/b3dpolypolygontools.hxx @@ -29,7 +29,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx index 7679f5a932dc..ae2c347e2b02 100644 --- a/include/basegfx/range/b2dconnectedranges.hxx +++ b/include/basegfx/range/b2dconnectedranges.hxx @@ -113,11 +113,9 @@ namespace basegfx aNewConnectedComponent.maTotalBounds = rRange; - // STAGE 1: Search for intersecting maDisjunctAggregatesList entries - // if rRange is empty, it will intersect with no // maDisjunctAggregatesList member. Thus, we can safe us // the check. @@ -192,7 +190,6 @@ namespace basegfx // STAGE 2: Add newly generated connected component list element - // add new component to the end of the component list aNewConnectedComponent.maComponentList.push_back( ComponentType( rRange, rUserData ) ); diff --git a/include/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx index 5cb6721e6ede..bd57a120a2ef 100644 --- a/include/basegfx/tools/b2dclipstate.hxx +++ b/include/basegfx/tools/b2dclipstate.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { class B2DRange; diff --git a/include/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx index 81416a489060..9c4fd78b6b35 100644 --- a/include/basegfx/tools/rectcliptools.hxx +++ b/include/basegfx/tools/rectcliptools.hxx @@ -24,7 +24,6 @@ #include <basegfx/range/b2ibox.hxx> - namespace basegfx { namespace tools diff --git a/include/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx index 3b4cacf59553..808da8f0ef57 100644 --- a/include/basegfx/tools/zoomtools.hxx +++ b/include/basegfx/tools/zoomtools.hxx @@ -14,7 +14,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { /** This namespace provides functions for optimized geometric zooming diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx index 530d631588a7..7c859d5def55 100644 --- a/include/basegfx/tuple/b2ituple.hxx +++ b/include/basegfx/tuple/b2ituple.hxx @@ -197,7 +197,6 @@ namespace basegfx // external operators - inline B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB) { B2ITuple aSum(rTupA); diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx index 60c9afec1561..1d5545f7f394 100644 --- a/include/basic/basicmanagerrepository.hxx +++ b/include/basic/basicmanagerrepository.hxx @@ -31,7 +31,6 @@ namespace basic { - //= BasicManagerRepository /** specifies a callback for instances which are interested in BasicManagers diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx index d6773bb01831..ce0d689e730e 100644 --- a/include/basic/vbahelper.hxx +++ b/include/basic/vbahelper.hxx @@ -32,7 +32,6 @@ namespace vba { */ - /** Locks or unlocks the controllers of all documents that have the same type as the specified document. @@ -52,7 +51,6 @@ BASIC_DLLPUBLIC void lockControllersOfAllDocuments( bool bLockControllers ); - /** Enables or disables the container windows of all controllers of all documents that have the same type as the specified document. @@ -73,7 +71,6 @@ BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments( bool bEnableWindows ); - /** Registers the passed path as working directory for the application the passed document belongs to. @@ -89,7 +86,6 @@ BASIC_DLLPUBLIC void registerCurrentDirectory( const OUString& rPath ); - } // namespace vba } // namespace basic diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index e0ac82ac33ef..fdffd6f5b8e7 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -221,7 +221,6 @@ namespace canvas bool updateClipState( const Sprite::Reference& rSprite ); - /// Owning sprite canvas SpriteSurface::Reference mpSpriteCanvas; diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx index b5aabff3099e..1f893c90e326 100644 --- a/include/codemaker/global.hxx +++ b/include/codemaker/global.hxx @@ -83,7 +83,6 @@ private: }; - // Helper functions ::rtl::OString getTempDir(const ::rtl::OString& sFileName); diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index f7a713196eaa..c4708f1956b9 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -380,8 +380,6 @@ inline Reference< interface_type > Reference< interface_type >::query( } - - inline bool BaseReference::operator == ( XInterface * pInterface ) const { if (_pInterface == pInterface) diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx index 0af1cdaddf4a..023bc43f817a 100644 --- a/include/comphelper/InlineContainer.hxx +++ b/include/comphelper/InlineContainer.hxx @@ -54,7 +54,6 @@ public: }; - /** Creates a vector which contains an arbitrary number of elements. usage: @@ -77,7 +76,6 @@ public: }; - /** Creates a set which contains an arbitrary number of elements. usage: @@ -101,7 +99,6 @@ public: }; - /** usage: map< k, v > aMap( MakeMap< k, v > diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index fdfeba6587bd..3755f363fac5 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -29,7 +29,6 @@ //= selection helper classes - namespace comphelper { diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 9e80e94526cf..9370cdfae20e 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OCommonAccessibleComponent /** base class encapsulating common functionality for the helper classes implementing diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 4eae0f781bd1..ed029a053880 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= IMutex diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index cd47edc78989..15f03013d380 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= AccessibleEventNotifier class COMPHELPER_DLLPUBLIC AccessibleEventNotifier diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index cbe81a38a7d1..89ea8d71b050 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -33,7 +33,6 @@ namespace comphelper { - // OAccessibleKeyBindingHelper diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index ca6edea1e98e..bb222c3b55f5 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -34,7 +34,6 @@ namespace comphelper { - //= OCommonAccessibleSelection /** base class encapsulating common functionality for the helper classes implementing diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index ed9e6ac2221a..7dd0fc5155ef 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -29,12 +29,10 @@ #include <comphelper/comphelperdllapi.h> - namespace comphelper { - // OCommonAccessibleText /** base class encapsulating common functionality for the helper classes implementing @@ -97,7 +95,6 @@ namespace comphelper }; - // OAccessibleTextHelper @@ -142,8 +139,6 @@ namespace comphelper #endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX - - // OAccessibleTextHelper is a helper class for implementing the // XAccessibleText interface. @@ -174,5 +169,4 @@ namespace comphelper // copyText - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index 23be9129cd72..e78c4009b562 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -46,7 +46,6 @@ namespace comphelper { - //= OAccessibleWrapper diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index a871fd80a0a9..5be23c9082cf 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -35,7 +35,6 @@ namespace comphelper { - //= IKeyPredicateLess class SAL_NO_VTABLE IKeyPredicateLess diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx index edb488573b3b..4634cf72667a 100644 --- a/include/comphelper/classids.hxx +++ b/include/comphelper/classids.hxx @@ -92,7 +92,6 @@ #define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60 - /* * StarCalc */ diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 839c6e7bd576..d5e3923eee14 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= ComponentBase class COMPHELPER_DLLPUBLIC ComponentBase diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx index 6957f7397f66..cb6013900a32 100644 --- a/include/comphelper/componentguard.hxx +++ b/include/comphelper/componentguard.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= ComponentGuard class ComponentGuard diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx index be2bf0509499..51ea3e64e26b 100644 --- a/include/comphelper/configurationhelper.hxx +++ b/include/comphelper/configurationhelper.hxx @@ -36,7 +36,6 @@ namespace comphelper{ - class COMPHELPER_DLLPUBLIC ConfigurationHelper { public: diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index 2cba09882991..730ebc651828 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -29,7 +29,6 @@ namespace comphelper { - //= IndexAccessIterator /** an iterator that iterates through all elements, starting from an XIndexAccess (pre-order) diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index ad973a21fe32..e1f9976d7f87 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -38,7 +38,6 @@ enum DocPasswordVerifierResult }; - /** Base class for a password verifier used by the DocPasswordHelper class below. @@ -90,7 +89,6 @@ public: }; - /** Helper that asks for a document password and checks its validity. */ class COMPHELPER_DLLPUBLIC DocPasswordHelper @@ -114,7 +112,6 @@ public: GenerateNewModifyPasswordInfo( const OUString& aPassword ); - /** This helper function allows to check whether the "Password to modify" provided by user is the correct one. @@ -134,8 +131,6 @@ public: const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); - - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" feature of Word. @@ -150,7 +145,6 @@ public: const OUString& aString ); - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to table protection of Excel. @@ -171,7 +165,6 @@ public: rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to table protection. @@ -192,7 +185,6 @@ public: rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - /** This helper function generates a random sequence of bytes of requested length. */ @@ -201,7 +193,6 @@ public: sal_Int32 nLength ); - /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. */ @@ -211,7 +202,6 @@ public: const css::uno::Sequence< sal_Int8 >& aDocId ); - /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. */ @@ -229,7 +219,6 @@ public: const sal_uInt8 pDocId[16] ); - /** This helper function tries to request and verify a password to load a protected document. @@ -298,7 +287,6 @@ private: }; - } // namespace comphelper #endif diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index ee44897344bf..31e2aad7482c 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -31,7 +31,6 @@ class AbortContinuation; class PasswordContinuation; - /** Selects which UNO document password request type to use. */ enum DocPasswordRequestType { @@ -40,7 +39,6 @@ enum DocPasswordRequestType }; - class COMPHELPER_DLLPUBLIC SimplePasswordRequest : public cppu::WeakImplHelper<css::task::XInteractionRequest> { @@ -64,7 +62,6 @@ private: }; - /** Implements the task.XInteractionRequest interface for requesting a password string for a document. */ @@ -98,7 +95,6 @@ private: }; - } // namespace comphelper #endif diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx index 07155054eee2..c30d79b40c95 100644 --- a/include/comphelper/documentinfo.hxx +++ b/include/comphelper/documentinfo.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= DocumentInfo namespace DocumentInfo diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx index 979665530bee..57bbab6947a0 100644 --- a/include/comphelper/evtlistenerhlp.hxx +++ b/include/comphelper/evtlistenerhlp.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= OCommandsListener // is helper class to avoid a cycle in refcount between the XEventListener // and the member XComponent diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx index 6975880414ae..a750d479064b 100644 --- a/include/comphelper/guarding.hxx +++ b/include/comphelper/guarding.hxx @@ -27,7 +27,6 @@ namespace comphelper { - // = class MutexRelease - diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 3ec18f893019..9849465aa6b9 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -36,7 +36,6 @@ namespace comphelper { - //= OInteraction /** template for instantiating concrete interaction handlers<p/> diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index 95164393ddce..ad040d1779e0 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OListenerContainer /** abstract base class which manages a listener container, including diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index e8987314ab5e..ef17801aa9f1 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -33,7 +33,6 @@ namespace comphelper { - //= string conversions, employed by the templatized log* members of //= EventLogger diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index 5fc0883b69cd..b7e64810d20b 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -36,7 +36,6 @@ namespace comphelper { - // = NamedValueCollection struct NamedValueCollection_Impl; diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx index 22b7a3c243a9..679d850fd467 100644 --- a/include/comphelper/officeresourcebundle.hxx +++ b/include/comphelper/officeresourcebundle.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OfficeResourceBundle class ResourceBundle_Impl; diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index c88a42d65ed6..a129ea0976fe 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -31,12 +31,10 @@ //= property helper classes - namespace comphelper { - //= OPropertyAccessor //= internal helper class for OPropertyArrayAggregationHelper diff --git a/include/comphelper/propertysequence.hxx b/include/comphelper/propertysequence.hxx index 433834277035..28561a6904d7 100644 --- a/include/comphelper/propertysequence.hxx +++ b/include/comphelper/propertysequence.hxx @@ -36,7 +36,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_PROPERTYSEQUENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index cc93292baa62..c52bb4a240f4 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -34,7 +34,6 @@ namespace comphelper { - //= OPropertyStateContainer typedef ::cppu::ImplHelper1 < css::beans::XPropertyState diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index ac4eb02cd26d..15d9da6899bb 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -28,7 +28,6 @@ //= property helper classes - namespace comphelper { diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index 3b9a6a89dab1..aa3b50e4e25f 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -36,12 +36,10 @@ //= property helper classes - namespace comphelper { - //= OPropertyStateHelper /// helper class for implementing property states diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 5c791e57dd93..4b82e8b2c687 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -76,7 +76,6 @@ namespace comphelper { - //= OProxyAggregation /** helper class for aggregating a proxy for a foreign object @@ -216,7 +215,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index a70b29e8d761..df91bdb16dcd 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -36,7 +36,6 @@ namespace comphelper // stream for reading data from a sequence of bytes - class COMPHELPER_DLLPUBLIC SequenceInputStream : public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable > { diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index a5fba55f1ec6..46f8153253f3 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -398,7 +398,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_SEQUENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 13e48a67d089..51974ac65e79 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= SharedMutex class COMPHELPER_DLLPUBLIC SharedMutex diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx index 910fd6c20f2f..2488e02ec925 100644 --- a/include/comphelper/synchronousdispatch.hxx +++ b/include/comphelper/synchronousdispatch.hxx @@ -35,12 +35,10 @@ namespace com { namespace sun { namespace star { } } } - namespace comphelper { - //= SynchronousDispatch /** a helper class for working with the dispatch interface replacing diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index c19d1bdb1671..608b21c22d02 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -73,7 +73,6 @@ namespace comphelper } - /** get a css::awt::FontDescriptor that is fully initialized with the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index b5167181e03a..427deb394186 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -160,7 +160,6 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) - /** ask for an iface of an aggregated object usage:<br/> Reference<XFoo> xFoo;<br/> diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 187ca03fb3e8..23952e4e268d 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OWeakListenerAdapterBase /** (the base for) an adapter which allows to add as listener to a foreign component, without @@ -84,7 +83,6 @@ namespace comphelper }; - //= OWeakListenerAdapter template< class BROADCASTER, class LISTENER > diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index c740078a155f..d15abd69f24d 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -529,7 +529,6 @@ namespace connectivity typedef ::rtl::Reference< OAssignValues > ORefAssignValues; - typedef ::rtl::Reference< OValueVector > OValueRow; typedef ::rtl::Reference< OValueRefVector > OValueRefRow; } diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 2b4da40dd176..bca2af8983db 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= OAutoConnectionDisposer typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener, diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index e93a59dd2acf..01ce6fa05f96 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -35,7 +35,6 @@ namespace dbtools { - //= OCharsetMap /** is a class which translates between different charset representations. @@ -114,7 +113,6 @@ namespace dbtools }; - //- OCharsetMap::CharsetIterator class OOO_DLLPUBLIC_DBTOOLS OCharsetMap::CharsetIterator diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index a67aa9d871f9..58614d66947c 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -47,7 +47,6 @@ namespace dbtools { - //= Special exception if cancel is pressed in DBA UI enum OOoBaseErrorCode diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index 1a1d53a02759..f4a9032c9a8c 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= DatabaseMetaData struct DatabaseMetaData_Impl; diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index ecdb26541d0a..78c579e20f77 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -108,7 +108,6 @@ namespace dbtools const css::lang::Locale& _rLocale); - /** creates a connection which can be used for the rowset given The function tries to obtain a connection for the row set with the following @@ -554,7 +553,6 @@ namespace dbtools const css::uno::Any& _rValue); - /** ask the user for parameters if the prepared statement needs some and sets them in the prepared statement @param _xConnection the connection must be able to create css::sdb::SingleSelectQueryComposers @param _xPreparedStmt the prepared statement where the parameters could be set when needed diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 00a1b869627a..06869b5b0f0b 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -33,7 +33,6 @@ namespace dbtools { - //= FilterManager /** manages the filter of a database component with filter properties diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx index bf66edd60b38..40ded2986df6 100644 --- a/include/connectivity/odbc.hxx +++ b/include/connectivity/odbc.hxx @@ -61,7 +61,6 @@ #endif - #ifdef UNX #ifndef ODBC_UNX @@ -80,7 +79,6 @@ #endif // UNX - #ifndef SQL_WCHAR #define SQL_WCHAR (-8) #endif diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 50d1efd821fc..c32fa6754f59 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -44,7 +44,6 @@ namespace param { - //= ParameterWrapper /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 98b722f5e002..0d80598fa431 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -34,7 +34,6 @@ namespace dbtools { - //= OPredicateInputController /** A class which allows input of an SQL predicate for a row set column diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index 4ca46984a697..7778ac179667 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -41,7 +41,6 @@ namespace connectivity css::container::XNamed> OView_BASE; - class OOO_DLLPUBLIC_DBTOOLS OView : public ::comphelper::OMutexAndBroadcastHelper, public OView_BASE, diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index 8218b5f8aa65..1484b905eb1b 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -30,7 +30,6 @@ namespace connectivity { - //= ErrorCondition /** the type of error codes to be used in SQLExceptions diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx index 34420d85aaf2..0d3971fc5329 100644 --- a/include/connectivity/standardsqlstate.hxx +++ b/include/connectivity/standardsqlstate.hxx @@ -25,7 +25,6 @@ namespace dbtools { - /** standard SQLStates to be used with an SQLException Extend this list whenever you need a new state ... diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 84151f65a282..e1cb17af49d3 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= StatementComposer struct StatementComposer_Data; diff --git a/include/cppu/helper/purpenv/Mapping.hxx b/include/cppu/helper/purpenv/Mapping.hxx index c824607b60d5..01c998c07c07 100644 --- a/include/cppu/helper/purpenv/Mapping.hxx +++ b/include/cppu/helper/purpenv/Mapping.hxx @@ -48,7 +48,6 @@ typedef void ProbeFun( uno_Any ** ppException ); - PURPENV_DLLPUBLIC void createMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index ee8ac008c31f..90d80cb3df02 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/cppuhelperdllapi.h> - #define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" #define COMPONENT_WRITEINFO "component_writeInfo" @@ -115,7 +114,6 @@ typedef void * (SAL_CALL * component_getFactoryFunc)( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); - namespace cppu { diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index d8ea54daf471..77dbc27792b3 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -204,7 +204,6 @@ private: }; - // helper defines needed for an interface container with a 32 bit key values struct equalInt32_Impl @@ -342,7 +341,6 @@ protected: }; - /** This abstract class maps the methods of the interfaces XMultiPropertySet, XFastPropertySet and XPropertySet to the methods getInfoHelper, convertFastPropertyValue, @@ -713,7 +711,6 @@ public: throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - private: OPropertySetHelper2( const OPropertySetHelper2 & ) SAL_DELETED_FUNCTION; OPropertySetHelper2 & operator = ( const OPropertySetHelper2 & ) @@ -735,5 +732,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index dfeca36f2282..3f4ef39ca3f1 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -35,7 +35,6 @@ namespace dbaui { - //= UndoManager struct UndoManager_Impl; diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 2d30a3788305..69b486e6c51d 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -42,7 +42,6 @@ namespace dbaui { - //= DBSubComponentController class DBSubComponentController; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index ba86c687495e..85a49a73da23 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -141,7 +141,6 @@ namespace dbaui // = helper - struct ControllerFeature : public css::frame::DispatchInformation { sal_uInt16 nFeatureId; @@ -259,8 +258,6 @@ namespace dbaui bool m_bExternalTitle : 1; - - // attribute access ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index 2d07106843fc..0fcd2867cddb 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -25,7 +25,6 @@ #include <vector> - namespace drawinglayer { namespace animation @@ -50,7 +49,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: @@ -69,7 +67,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: @@ -90,7 +87,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: @@ -113,7 +109,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { protected: @@ -135,7 +130,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx index cebcca818e4d..fedcaaa309a5 100644 --- a/include/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/include/drawinglayer/attribute/fillbitmapattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 454e633cf46b..ff3d3ebe81e3 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -52,7 +52,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace attribute @@ -101,7 +100,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index 9d9dbd635c32..fc1b8029f9d6 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index aee4a2d233ac..58c643b54283 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -49,7 +49,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace attribute @@ -106,7 +105,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index d053e42edd85..1b35189a6993 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 6fd84c9ba4fd..a405ebce540c 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx index 399e6c2fc08f..8f348bef5841 100644 --- a/include/drawinglayer/attribute/linestartendattribute.hxx +++ b/include/drawinglayer/attribute/linestartendattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index 7ab243214dc8..db144b7a030a 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -35,7 +35,6 @@ namespace basegfx { } - namespace drawinglayer { namespace attribute @@ -76,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index 8bb1d6659ae9..b68f0a303e40 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -32,7 +32,6 @@ // predefines - namespace drawinglayer { namespace attribute @@ -70,7 +69,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx index fa70f82d5845..434954757bdb 100644 --- a/include/drawinglayer/attribute/sdrfillattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx index a3ed6a81cc35..b3163a5bb288 100644 --- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLGRAPHICATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index 2db369076538..3b98b464ec76 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx index 48e9cd710786..70e0e450b210 100644 --- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -39,7 +39,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx index ecd2fd1c5d29..af1e1561f4f9 100644 --- a/include/drawinglayer/attribute/sdrlineattribute.hxx +++ b/include/drawinglayer/attribute/sdrlineattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -85,7 +84,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx index 548751ce2c69..d56a265c8159 100644 --- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -84,7 +83,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index ba34c323f3e0..b4ea75bfbf87 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -37,7 +37,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -90,7 +89,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx index 48b1d8cea043..bdd0edf1c826 100644 --- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -34,7 +34,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -76,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx index d3b0d0ce988f..d92110dbdb49 100644 --- a/include/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 83be2d6c0851..69576edf56d6 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -32,7 +32,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -69,7 +68,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 72e857c407a3..cb76998e69a8 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -41,7 +41,6 @@ namespace basegfx { } - namespace drawinglayer { namespace geometry @@ -169,7 +168,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index b84ff02a4f65..e35d0bf346a1 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -39,7 +39,6 @@ namespace basegfx { } - namespace drawinglayer { namespace geometry @@ -166,7 +165,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 38ae5623b512..7050cbbd33e7 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -33,7 +33,6 @@ namespace drawinglayer { namespace animation { }} - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -129,7 +127,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -166,7 +163,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 33cae391c045..868f1a690943 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -83,7 +83,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 80ddeedf6507..fdae3193aed9 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -296,7 +296,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index df0e60d0709f..c7eb9e32cf37 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -74,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index bc6bf6bafd76..4cca37b401d9 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/table/BorderLineStyle.hpp> - namespace drawinglayer { namespace primitive2d @@ -143,7 +142,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index a7d310150533..54df6b63a6c4 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/awt/XControl.hpp> - namespace drawinglayer { namespace primitive2d @@ -107,7 +106,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index fcfb7f9506f8..51529fead5aa 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -96,7 +95,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CROPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index c69142072dbe..d4601307184d 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -72,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index a39c35d60028..7d32532290d2 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -115,7 +115,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 78d4f91d916b..92bde2b8ce43 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -116,7 +116,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 4367e17556c1..377354a34500 100644 --- a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -82,7 +82,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index c7a8a0e39494..df0d84fd29ab 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -113,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index b0d1077730bd..4ae5307a04c8 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -81,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRAPHICPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 8a08ce859193..3f40a5575ac9 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -102,7 +102,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index eb5e5df8fd93..0108ae68ec5b 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -27,7 +27,6 @@ #include <svtools/grfmgr.hxx> - namespace drawinglayer { namespace primitive2d @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx index 1a322e0e7e4f..151473ba5bbe 100644 --- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx @@ -29,7 +29,6 @@ class Graphic; - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVEHELPER2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 6f501bcb4c7a..7d4a2fac189a 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -113,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index af377cd3f479..67b39edd5072 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -89,7 +89,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index f64a27609a4b..f37cf08ef876 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -108,7 +108,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index 820c34f73eda..bb59e89964ea 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -58,7 +57,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx index 7070b9597792..537e73867d52 100644 --- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -53,7 +52,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 15c33c97e001..e125eb065d56 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -82,7 +82,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 423fe65e19d4..2a0b16b5cf90 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive2d @@ -73,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index da882fb5c663..c09b4479c128 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -28,7 +28,6 @@ #include <vcl/graph.hxx> - namespace drawinglayer { namespace primitive2d @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index cf42cf7c1485..632507665e95 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -88,7 +88,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 73301cd7a74b..e4ee26e4de8d 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX @@ -28,7 +27,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace primitive2d @@ -75,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 764f7cdf8c64..f8d888a94fcb 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index 64d0bf520342..bdd8bbe35d4a 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive2d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PATTERNFILLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index 46a2e39d806d..841b1ae7de96 100644 --- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -77,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index c5914827ba2b..8ae8fd818765 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -311,7 +311,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 57f88dbcc3de..63e6866fdb44 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -466,7 +466,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 6c02ee4ad1fb..12e234d8bea7 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -72,7 +71,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -111,7 +109,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -150,7 +147,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -193,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 16394285fca6..b434dc996bf1 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -32,7 +32,6 @@ #include <drawinglayer/attribute/sdrlightattribute3d.hxx> - namespace drawinglayer { namespace primitive2d @@ -153,7 +152,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index 40d54ab173c4..295c558fca28 100644 --- a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -33,7 +33,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index e0a5fb4045ba..b3970df97d0e 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive2d @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index a5d24e5287d4..28f6aa86978a 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -26,7 +26,6 @@ #include <vcl/pdfwriter.hxx> - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index ffbcf306a12d..991847e6ea20 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -414,7 +414,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SVGGRADIENTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 811b38fa043b..702d5bf29abe 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace drawinglayer { namespace primitive2d @@ -77,7 +76,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTBREAKUPHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 41247cd2e7a8..0c66993a3d60 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -100,7 +99,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 61a0ecf377fc..9464d80e6563 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -26,7 +26,6 @@ #include <vcl/vclenum.hxx> - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 0abf1f21637e..093ccce65fa3 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> - namespace drawinglayer { namespace primitive2d @@ -54,7 +53,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -77,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -100,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -123,7 +119,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -177,7 +172,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -206,7 +200,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index 48fa635fbbff..2fb9a4a5ec17 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -28,7 +28,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive2d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 1513e543934f..bed20c5de4b2 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -38,7 +38,6 @@ class OutputDevice; - namespace drawinglayer { namespace primitive2d @@ -189,7 +188,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 10100009c78f..5008fe41b307 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/lang/Locale.hpp> - namespace drawinglayer { namespace primitive2d @@ -64,7 +63,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -105,7 +103,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -146,7 +143,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index 9f09dcd6dc97..38e4543eed52 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 7effb04df6bc..a4d9572e9da2 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 4a67adb467f0..6341d088f90a 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -70,7 +69,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index 5ed17c311518..af3f256f147e 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -27,7 +27,6 @@ #include <vcl/wall.hxx> - namespace drawinglayer { namespace primitive2d @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index db0aa914b8b5..90c2bb2362c4 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -86,7 +86,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 26b100ea2bf4..9cc610a52dcf 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -211,7 +211,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 30be6c30efea..54141823e1b5 100644 --- a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -49,7 +49,6 @@ #define PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 18) - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index 1a6186843a3b..d2adef9eee4f 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 8ea916229a7a..c5003c6d6563 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/fillhatchattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -80,7 +79,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index 7b95cc870aff..ed481de8c68c 100644 --- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -60,7 +59,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index 9361285d078d..bb077fe6afad 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace primitive3d @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index 483b7b44d18e..34721a351ee8 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/strokeattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -123,7 +121,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 69d273f6d731..dde83a650d01 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -33,7 +33,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive3d @@ -102,7 +101,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 7d3476a3553d..89fc50ce1521 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -27,7 +27,6 @@ #include <drawinglayer/attribute/materialattribute3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -77,7 +76,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 21232d7ddd0c..4b54b42879a9 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 01c2180910bd..081f453af3d9 100644 --- a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -45,7 +45,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace primitive3d @@ -92,7 +91,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 069f88b5fb81..bd30c33cca38 100644 --- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -34,7 +34,6 @@ namespace drawinglayer { namespace geometry { }} - namespace drawinglayer { namespace primitive3d @@ -131,7 +130,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 9c4103df4623..be0165fef47c 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive3d @@ -123,7 +122,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 0df11275232c..e9c3fd059ec0 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive3d @@ -129,7 +128,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index ad3261693875..d80dc149a7d9 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index 460fd458591d..1dded61f002b 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -30,7 +30,6 @@ #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> - namespace drawinglayer { /** SdrPrimitive3D class @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 9b4368f4b9b4..db3b57d81fd8 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx index 5c568fa113fb..0dd4a1289613 100644 --- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -27,7 +27,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive3d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index bd81c095f5a3..3cf1bd5d6c3a 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -73,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -115,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -154,7 +151,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -193,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -224,7 +219,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index 54d597f12fd0..d223b065dbf2 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b3dhommatrix.hxx> - namespace drawinglayer { namespace primitive3d @@ -68,7 +67,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index 274fd5f61d98..622828a9a50b 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - namespace drawinglayer { namespace processor2d @@ -190,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index 0bab96cd7ca9..dd06df9c4f11 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace processor2d @@ -62,7 +61,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index 1afe0debd3a0..389f8768dae1 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> - namespace drawinglayer { namespace processor2d @@ -60,7 +59,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 97982f75e70f..b7900b29e882 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -29,7 +29,6 @@ #include <vector> - namespace drawinglayer { namespace processor2d @@ -92,7 +91,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index b22e78137df5..887d41982790 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> - namespace drawinglayer { namespace processor3d @@ -69,7 +68,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index bc4279f8ede7..e70f552661e4 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/processor3d/defaultprocessor3d.hxx> - namespace drawinglayer { namespace processor3d @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index f8b80f5c8790..7bbb5a4aaa37 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -57,7 +57,6 @@ namespace drawinglayer { namespace texture { }} - namespace drawinglayer { namespace processor3d @@ -150,7 +149,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index b4111aa032df..ba828e040e78 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -29,7 +29,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace processor3d diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 9e4ca9f9908f..c3e4e032a851 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -33,7 +33,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace processor3d diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 3f1d6d07adc0..bbe620433a00 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -51,7 +51,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -67,7 +66,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -102,7 +100,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -134,7 +131,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -165,7 +161,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -192,7 +187,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -220,7 +214,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -248,7 +241,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -276,7 +268,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -313,7 +304,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -350,7 +340,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_TEXTURE_TEXTURE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx index 0a29a13d2032..c5f6bcd38c49 100644 --- a/include/drawinglayer/tools/converters.hxx +++ b/include/drawinglayer/tools/converters.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> - namespace drawinglayer { namespace tools @@ -43,7 +42,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx index 3e86f609e9d0..5a2dd3440528 100644 --- a/include/editeng/AccessibleStringWrap.hxx +++ b/include/editeng/AccessibleStringWrap.hxx @@ -30,11 +30,9 @@ class Rectangle; class Point; - // AccessibleStringWrap declaration - class AccessibleStringWrap { public: diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index 3e23250c2a69..ef5ea81ab95e 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -37,7 +37,6 @@ #define DEF_LINE_WIDTH_5 10 - namespace editeng { // values from css::table::BorderLineStyle diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index b35dffe347bc..d99149d01a9a 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -111,7 +111,6 @@ class DeletedNodeInfo; class ParaPortionList; - /** values for: SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ); */ diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index bef62976fa39..5d3acdce600e 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -40,7 +40,6 @@ class MetaAction; // class SvxFieldItem --------------------------------------------------- - class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase { public: @@ -307,7 +306,6 @@ enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT = 0, // File name with Extension }; - class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData { private: @@ -414,8 +412,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index f651e9bbb960..0e8a91253e09 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -62,8 +62,6 @@ public: }; - - #endif diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx index e088e834724e..4af2a077ee1a 100644 --- a/include/editeng/frmdir.hxx +++ b/include/editeng/frmdir.hxx @@ -21,7 +21,6 @@ #define INCLUDED_EDITENG_FRMDIR_HXX - /** Defines possible text directions in frames. */ enum SvxFrameDirection { @@ -46,7 +45,6 @@ enum SvxFrameDirection }; - #endif // INCLUDED_EDITENG_FRMDIR_HXX diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index b3e10ca0947f..9ef655ed1128 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -82,9 +82,6 @@ public: }; - - - #endif diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index f92f72cb3e5e..ee6150f7288f 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -41,7 +41,6 @@ OUString GetColorString( const Color& rCol ); EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); - inline long Scale( long nVal, long nMult, long nDiv ) { BigInt aVal( nVal ); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index bbb5a702f633..467b0ae4a51c 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -57,7 +57,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem { public: @@ -90,7 +89,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem { public: diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 3f354dd8c8e3..8c947eabce26 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -23,7 +23,6 @@ #include <editeng/editengdllapi.h> - // class SvxLineItem ----------------------------------------------------- @@ -68,8 +67,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index fff1b3fed6db..31dc1685b674 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -50,7 +50,6 @@ public: }; - #endif // INCLUDED_EDITENG_MEASFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 749874010c77..15f8fe607e8e 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -49,7 +49,6 @@ public: }; - #endif diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 986c77652dd6..59ff46fe5677 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -62,7 +62,6 @@ inline SvxOpaqueItem &SvxOpaqueItem::operator=( const SvxOpaqueItem &rCpy ) } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 3e5447e111cd..5bcb65743413 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -23,7 +23,6 @@ #include <editeng/editengdllapi.h> - // class SvxPrintItem ---------------------------------------------------- @@ -63,8 +62,6 @@ inline SvxPrintItem &SvxPrintItem::operator=( const SvxPrintItem &rCpy ) } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index da2772cce8f2..e6f930557d71 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -84,8 +84,6 @@ inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy ) } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index ceb2276bc7dc..d1a7978c5391 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -20,7 +20,6 @@ #define INCLUDED_EDITENG_SVXENUM_HXX - enum SvxCaseMap { SVX_CASEMAP_NOT_MAPPED, diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index fe094daef879..761d10995c0c 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -38,7 +38,6 @@ namespace vcl { class Window; } namespace linguistic { enum class DictionaryError; } - class EDITENG_DLLPUBLIC LinguMgr { friend class LinguMgrExitLstnr; @@ -84,7 +83,6 @@ public: }; - namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; }}}} @@ -112,8 +110,6 @@ EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( const css::uno::Reference< css::linguistic2::XHyphenatedWord > & rHyphWord ); - - class EDITENG_DLLPUBLIC SvxDicListChgClamp { private: @@ -130,7 +126,6 @@ public: }; - //TODO: remove those functions or make them inline EDITENG_DLLPUBLIC css::uno::Reference< css::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); @@ -161,5 +156,4 @@ EDITENG_DLLPUBLIC short SvxDicError( vcl::Window *pParent, linguistic::Dictionar #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 498d41761736..ddd2a04593a8 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -66,7 +66,6 @@ #define UNO_NAME_FILLBMP_MODE "FillBitmapMode" - #define UNO_NAME_LINESTYLE "LineStyle" #define UNO_NAME_LINEDASH "LineDash" #define UNO_NAME_LINEWIDTH "LineWidth" diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index cbe5b8be6057..00493de55cbd 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -351,7 +351,6 @@ public: }; - class SvxUnoTextBase; class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase, public css::lang::XTypeProvider, @@ -483,7 +482,6 @@ public: }; - class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1< css::container::XEnumeration > { private: @@ -578,7 +576,6 @@ public: }; - class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< css::container::XEnumeration > { private: @@ -599,7 +596,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase, public css::text::XTextCursor, public css::lang::XTypeProvider, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 14b6e3c65e88..d6c584984d20 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -26,7 +26,6 @@ class SvXMLNamespaceMap; - class SvXMLAttrContainerData; class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index 72b4181930f7..afb3ddbaa8cc 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX #define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX @@ -27,7 +26,6 @@ #include <filter/msfilter/msfilterdllapi.h> - namespace msfilter { // Windows Country IDs ======================================================== @@ -301,11 +299,9 @@ MSFILTER_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage ); MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry ); - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 1cb93dcf4568..c6c9065ac037 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -135,7 +135,6 @@ enum ESCHER_wMode }; - enum ESCHER_ShapePath { ESCHER_ShapeLines, // A line of straight segments @@ -605,7 +604,6 @@ struct EscherPropertyValueHelper }; - struct EscherPersistEntry { sal_uInt32 mnID; @@ -616,7 +614,6 @@ struct EscherPersistEntry }; - class EscherBlibEntry { @@ -658,7 +655,6 @@ public: }; - #define _E_GRAPH_PROV_USE_INSTANCES 1 #define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2 @@ -736,7 +732,6 @@ public: }; - #define ESCHER_CREATEPOLYGON_LINE 1 #define ESCHER_CREATEPOLYGON_POLYLINE 2 #define ESCHER_CREATEPOLYGON_POLYPOLYGON 4 @@ -948,7 +943,6 @@ public: }; - class MSFILTER_DLLPUBLIC EscherPersistTable { @@ -967,7 +961,6 @@ public: }; - class EscherEx; /// abstract base class for ESCHER_ClientTextbox, ESCHER_ClientData @@ -1056,8 +1049,6 @@ public: }; - - /** Instance for global DFF data, shared through various instances of EscherEx. */ class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider { diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index c6836fc612a6..a87ac3dd3de7 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -30,7 +30,6 @@ namespace msfilter { - /** Encodes and decodes data from protected MSO 95- documents. */ class MSFILTER_DLLPUBLIC MSCodec_Xor95 @@ -173,8 +172,6 @@ public: }; - - /** Encodes and decodes data from protected MSO 97+ documents. This is a wrapper class around low level cryptographic functions from RTL. @@ -356,7 +353,6 @@ private: }; - } // namespace msfilter #endif diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx index e1e257f32755..f58c9242ceb0 100644 --- a/include/filter/msfilter/msoleexp.hxx +++ b/include/filter/msfilter/msoleexp.hxx @@ -45,7 +45,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index acd6e593460a..262388fc7992 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -31,7 +31,6 @@ namespace ooo { namespace vba { - struct MSFILTER_DLLPUBLIC MacroResolvedInfo { SfxObjectShell* mpDocContext; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index d1a1078c7a99..2f04a8e0453e 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -463,8 +463,6 @@ public: }; - - class SvxFieldItem; struct MSFILTER_DLLPUBLIC PPTFieldEntry { @@ -516,7 +514,6 @@ struct ProcessData }; - class SdrTextObj; class SfxObjectShell; diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 33b26b105fc9..f42555419ec1 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -47,7 +47,6 @@ class SfxObjectShell; */ - class MSFILTER_DLLPUBLIC SvxImportMSVBasic { public: diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 37e474329627..04d03b0f7b67 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -36,7 +36,6 @@ namespace formula enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT }; - class FormulaDlg_Impl; class IControlReferenceHandler; class IFunctionDescription; diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index 6a33919c43fd..667b11b727ac 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -38,7 +38,6 @@ namespace framework { - //= IMutexGuard class SAL_NO_VTABLE IMutexGuard diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index 26675c3e0082..22cf78512f85 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -183,7 +183,6 @@ public: static void setConfiguredAsianFallback( LanguageType nLang ); - /** Encapsulated methods that shall only be accessed through class LanguageTag. */ @@ -200,7 +199,6 @@ public: }; - struct LanguagetagMapping { OUString maBcp47; @@ -216,7 +214,6 @@ public: static ::std::vector< LanguagetagMapping > getDefinedLanguagetags(); - /** Encapsulated conversion methods used by LanguageTag and conversions, not to be used by anything else. */ diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index c0e0419a11c1..6265d1aa4096 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -107,5 +107,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index e9cf43177bfc..0bf2cd7892f5 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -33,7 +33,6 @@ namespace oox { namespace core { - namespace CodecHelper { /** Returns the password hash if it is in the required 16-bit limit. */ @@ -41,7 +40,6 @@ namespace CodecHelper } - /** Encodes and decodes data from/to protected MS Office documents. Implements a simple XOR encoding/decoding algorithm used in MS Office @@ -163,7 +161,6 @@ private: }; - /** Encodes and decodes data from protected MSO 97+ documents. This is a wrapper class around low level cryptographic functions from RTL. @@ -292,7 +289,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 311eefa0b290..e19bdeb87026 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -36,7 +36,6 @@ namespace oox { namespace core { - /** Wrapper for a fast SAX parser that works on automatically generated OOXML token and namespace identifiers. */ @@ -89,7 +88,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 744d9225870c..339d3caa2d75 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -32,7 +32,6 @@ namespace oox { namespace core { - /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface that provides access to the tokens generated from the internal token name list. */ @@ -62,7 +61,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 519e63ff0504..bed536660d7f 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -111,7 +111,6 @@ public: virtual bool exportDocument() = 0; - /** Returns the component context passed in the filter constructor (always existing). */ const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 9ecd9fea1679..7c5552f5cbdb 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -40,7 +40,6 @@ namespace oox { namespace core { - /** Document handler specifically designed for detecting OOXML file formats. It takes a reference to the filter string object via its constructor, and @@ -151,7 +150,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index f1110db8cf13..952d301b7965 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -34,7 +34,6 @@ namespace oox { namespace core { - /** Base data of a fragment. This data is stored in a separate struct to make it accessible in every @@ -55,7 +54,6 @@ struct FragmentBaseData }; - /** Describes record identifiers used to create contexts in a binary stream. If a record is used to start a new context, usually the record identifier @@ -73,7 +71,6 @@ struct RecordInfo }; - typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE @@ -120,7 +117,6 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 200be17e360d..8ec3c00474a3 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper { protected: @@ -114,7 +113,6 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; - } // namespace core } // namespace oox diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 03c69042cf88..a9909a0db596 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -34,7 +34,6 @@ namespace prv { class Locator; } namespace prv { class ContextStack; } - struct RecordInputSource { BinaryInputStreamRef mxInStream; @@ -43,7 +42,6 @@ struct RecordInputSource }; - class RecordParser { public: @@ -79,7 +77,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 6f9fd44a9305..018634972535 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - /** Expands to an OUString containing an 'officeDocument' transitional relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \ @@ -64,7 +63,6 @@ struct Relation }; - class Relations; typedef std::shared_ptr< Relations > RelationsRef; @@ -117,7 +115,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index d7ceb73238e3..8d1237adfbf4 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -26,7 +26,6 @@ namespace oox { namespace core { - class RelationsFragment : public FragmentHandler { public: @@ -45,7 +44,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 6dc4c3b83e99..e2415b3f64ca 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -97,7 +97,6 @@ public: virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; - OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart ); /** Imports a fragment using the passed fragment handler, which contains diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index ebce01a4006d..f8ee8d043d27 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -42,7 +42,6 @@ struct ChartSpaceModel; struct DataSequenceModel; - class OOX_DLLPUBLIC ChartConverter { public: @@ -94,7 +93,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index e6539cae744c..b09558f4b5ba 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -28,7 +28,6 @@ namespace drawingml { namespace chart { - struct DataSequenceModel { typedef ::std::map< sal_Int32, css::uno::Any > AnyMap; @@ -43,7 +42,6 @@ struct DataSequenceModel }; - struct DataSourceModel { typedef ModelRef< DataSequenceModel > DataSequenceRef; @@ -55,7 +53,6 @@ struct DataSourceModel }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 110b0d6e36f3..98352cbc11e8 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - class OOX_DLLPUBLIC Color { public: diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 6fa8261e7956..a6114ac7e279 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - const sal_Int32 PER_PERCENT = 1000; const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; @@ -44,7 +43,6 @@ const sal_Int32 PER_DEGREE = 60000; const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; - struct LineProperties; typedef std::shared_ptr< LineProperties > LinePropertiesPtr; @@ -78,7 +76,6 @@ class Theme; typedef std::shared_ptr< Theme > ThemePtr; - namespace table { class TableProperties; @@ -87,7 +84,6 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table - /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs ); @@ -141,7 +137,6 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjus const char* GetHatchPattern( const css::drawing::Hatch& rHatch ); - // CT_IndexRange struct IndexRange { sal_Int32 start; @@ -152,7 +147,6 @@ struct IndexRange { IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); - const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm. /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ @@ -169,7 +163,6 @@ inline sal_Int32 convertEmuToHmm( sal_Int64 nValue ) } - /** A structure for a point with 64-bit integer components. */ struct EmuPoint { @@ -181,7 +174,6 @@ struct EmuPoint }; - /** A structure for a size with 64-bit integer components. */ struct EmuSize { @@ -193,7 +185,6 @@ struct EmuSize }; - /** A structure for a rectangle with 64-bit integer components. */ struct EmuRectangle : public EmuPoint, public EmuSize { @@ -206,7 +197,6 @@ struct EmuRectangle : public EmuPoint, public EmuSize }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 9f7115c2cf69..2cf6c6285a33 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -37,7 +37,6 @@ public: }; - class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext { public: @@ -52,7 +51,6 @@ private: }; - class OleObjectGraphicDataContext : public ShapeContext { public: @@ -65,7 +63,6 @@ private: }; - class Diagram; class DiagramGraphicDataContext @@ -84,7 +81,6 @@ private: }; - class ChartGraphicDataContext : public ShapeContext { public: @@ -102,7 +98,6 @@ private: }; - } } #endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 3306a4c171ff..4aaedd7c1d81 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -93,7 +93,6 @@ struct OOX_DLLPUBLIC ShapePropertyInfo }; - class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap { public: @@ -143,7 +142,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 557e9a16248e..134167f3fdad 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -30,7 +30,6 @@ namespace oox { namespace drawingml { - const sal_Int32 THEMED_STYLE_SUBTLE = 1; const sal_Int32 THEMED_STYLE_MODERATE = 2; const sal_Int32 THEMED_STYLE_INTENSE = 3; @@ -102,7 +101,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index 4287778d3a9f..24ea7abb2d21 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -29,7 +29,6 @@ namespace drawingml { class Theme; - class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 { public: @@ -46,7 +45,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 46dd050f62a1..2cde09d3e2c0 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -28,7 +28,6 @@ namespace oox { namespace dump { - class DffStreamObject : public SequenceRecordObjectBase { public: @@ -59,7 +58,6 @@ private: }; - } // namespace dump } // namespace oox diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 0f274356b834..4561720c31ee 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -62,7 +62,6 @@ namespace oox { namespace dump { - #define OOX_DUMP_UNUSED "unused" #define OOX_DUMP_UNKNOWN "?unknown" @@ -97,8 +96,6 @@ typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; - - /** Static helper functions for system file and stream access. */ class InputOutputHelper { @@ -137,7 +134,6 @@ public: }; - class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { public: @@ -155,8 +151,6 @@ public: }; - - /** Specifiers for atomic data types. */ enum DataType { @@ -174,7 +168,6 @@ enum DataType }; - /** Specifiers for the output format of values. */ enum FormatType { @@ -188,7 +181,6 @@ enum FormatType }; - /** Describes the output format of a data item. Data items are written in the following format: @@ -249,10 +241,6 @@ struct ItemFormat }; - - - - /** Static helper functions for formatted output to strings. */ class StringHelper { @@ -364,7 +352,6 @@ public: }; - template< typename Type > void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) { @@ -387,7 +374,6 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm } - class String : public OUString { public: @@ -403,8 +389,6 @@ public: static const String EMPTY_STRING; - - class Base; /** Base class for all dumper classes. @@ -471,8 +455,6 @@ protected: }; - - class ConfigItemBase { public: @@ -510,7 +492,6 @@ private: }; - class SharedConfigData; class Config; @@ -600,7 +581,6 @@ private: }; - class ConstList : public NameListBase { public: @@ -632,7 +612,6 @@ private: }; - class MultiList : public ConstList { public: @@ -653,7 +632,6 @@ private: }; - class FlagsList : public NameListBase { public: @@ -684,7 +662,6 @@ private: }; - class CombiList : public FlagsList { public: @@ -717,7 +694,6 @@ private: }; - class UnitConverter : public NameListBase { public: @@ -742,7 +718,6 @@ private: }; - class NameListWrapper { public: @@ -762,7 +737,6 @@ private: static const NameListWrapper NO_LIST; - class ItemFormatMap { private: @@ -782,8 +756,6 @@ public: }; - - class SharedConfigData : public Base, public ConfigItemBase { public: @@ -841,7 +813,6 @@ private: }; - template< typename ListType > std::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) { @@ -863,7 +834,6 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi } - class Config : public Base { public: @@ -929,7 +899,6 @@ private: typedef std::shared_ptr< Config > ConfigRef; - template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const { @@ -960,8 +929,6 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const } - - class Output : public Base { public: @@ -970,7 +937,6 @@ public: const OUString& rFileName ); - void newLine(); void emptyLine( size_t nCount = 1 ); @@ -1047,7 +1013,6 @@ private: typedef std::shared_ptr< Output > OutputRef; - class IndentGuard { public: @@ -1061,7 +1026,6 @@ private: }; - class TableGuard { public: @@ -1084,7 +1048,6 @@ private: }; - class ItemGuard { public: @@ -1100,7 +1063,6 @@ private: }; - class MultiItemsGuard { public: @@ -1114,7 +1076,6 @@ private: }; - class StorageIterator : public Base { public: @@ -1137,8 +1098,6 @@ private: }; - - class ObjectBase : public Base { public: @@ -1160,7 +1119,6 @@ protected: virtual void implDump(); - Config& cfg() const { return *mxConfig; } private: @@ -1170,8 +1128,6 @@ private: typedef std::shared_ptr< ObjectBase > ObjectRef; - - class StorageObjectBase : public ObjectBase { protected: @@ -1242,9 +1198,6 @@ private: }; - - - class OutputObjectBase : public ObjectBase { public: @@ -1261,7 +1214,6 @@ protected: virtual bool implIsValid() const override; - void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); void writeCharItem( const String& rName, sal_Unicode cData ); @@ -1304,8 +1256,6 @@ protected: }; - - template< typename Type > void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp ) { @@ -1412,8 +1362,6 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type } - - class InputObjectBase : public OutputObjectBase { public: @@ -1492,8 +1440,6 @@ protected: }; - - template< typename Type > Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp ) { @@ -1609,8 +1555,6 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) } - - class BinaryStreamObject : public InputObjectBase { public: @@ -1626,8 +1570,6 @@ protected: }; - - class TextStreamObjectBase : public InputObjectBase { protected: @@ -1657,7 +1599,6 @@ protected: }; - class TextLineStreamObject : public TextStreamObjectBase { public: @@ -1678,7 +1619,6 @@ protected: }; - class XmlStreamObject : public TextStreamObjectBase { public: @@ -1692,8 +1632,6 @@ protected: }; - - class RecordObjectBase : public InputObjectBase { protected: @@ -1739,7 +1677,6 @@ private: }; - class SequenceRecordObjectBase : public RecordObjectBase { protected: @@ -1762,8 +1699,6 @@ private: }; - - /** Base class for a file dumper. Derived classes implement the implDump() function to add functionality. */ @@ -1783,8 +1718,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index ea9604dcc218..0edae384cb4d 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -33,8 +33,6 @@ namespace oox { namespace dump { - - class OleInputObjectBase : public InputObjectBase { protected: @@ -52,8 +50,6 @@ protected: }; - - class StdFontObject : public OleInputObjectBase { public: @@ -64,7 +60,6 @@ protected: }; - class StdPicObject : public OleInputObjectBase { public: @@ -75,8 +70,6 @@ protected: }; - - class OleStreamObject : public OleInputObjectBase { public: @@ -84,7 +77,6 @@ public: }; - class OleCompObjObject : public OleStreamObject { public: @@ -95,8 +87,6 @@ protected: }; - - class OlePropertyStreamObject : public InputObjectBase { public: @@ -136,7 +126,6 @@ private: }; - class OleStorageObject : public StorageObjectBase { public: @@ -156,8 +145,6 @@ protected: }; - - class ComCtlObjectBase : public OleInputObjectBase { protected: @@ -187,7 +174,6 @@ protected: }; - class ComCtlScrollBarObject : public ComCtlObjectBase { public: @@ -198,7 +184,6 @@ protected: }; - class ComCtlProgressBarObject : public ComCtlObjectBase { public: @@ -209,7 +194,6 @@ protected: }; - class ComCtlSliderObject : public ComCtlObjectBase { public: @@ -220,7 +204,6 @@ protected: }; - class ComCtlUpDownObject : public ComCtlObjectBase { public: @@ -231,7 +214,6 @@ protected: }; - class ComCtlImageListObject : public ComCtlObjectBase { public: @@ -244,7 +226,6 @@ protected: }; - class ComCtlTabStripObject : public ComCtlObjectBase { public: @@ -256,7 +237,6 @@ protected: }; - class ComCtlTreeViewObject : public ComCtlObjectBase { public: @@ -271,7 +251,6 @@ private: }; - class ComCtlStatusBarObject : public ComCtlObjectBase { public: @@ -284,8 +263,6 @@ protected: }; - - class AxPropertyObjectBase : public OleInputObjectBase { protected: @@ -395,7 +372,6 @@ private: }; - template< typename Type > void AxPropertyObjectBase::alignInput() { @@ -425,7 +401,6 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper } - class AxCFontNewObject : public AxPropertyObjectBase { public: @@ -436,7 +411,6 @@ protected: }; - class AxColumnInfoObject : public AxPropertyObjectBase { public: @@ -447,7 +421,6 @@ protected: }; - class AxCommandButtonObject : public AxPropertyObjectBase { public: @@ -459,7 +432,6 @@ protected: }; - class AxMorphControlObject : public AxPropertyObjectBase { public: @@ -478,7 +450,6 @@ private: }; - class AxLabelObject : public AxPropertyObjectBase { public: @@ -490,7 +461,6 @@ protected: }; - class AxImageObject : public AxPropertyObjectBase { public: @@ -501,7 +471,6 @@ protected: }; - class AxScrollBarObject : public AxPropertyObjectBase { public: @@ -512,7 +481,6 @@ protected: }; - class AxSpinButtonObject : public AxPropertyObjectBase { public: @@ -523,7 +491,6 @@ protected: }; - class AxTabStripObject : public AxPropertyObjectBase { public: @@ -538,8 +505,6 @@ private: }; - - class FormControlStreamObject : public OleInputObjectBase { public: @@ -565,8 +530,6 @@ private: }; - - struct VbaFormSiteInfo { OUString maProgId; @@ -580,7 +543,6 @@ struct VbaFormSiteInfo typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; - struct VbaFormSharedData { OUStringVector maClassInfoProgIds; @@ -588,7 +550,6 @@ struct VbaFormSharedData }; - class VbaFormClassInfoObject : public AxPropertyObjectBase { public: @@ -602,7 +563,6 @@ private: }; - class VbaFormSiteObject : public AxPropertyObjectBase { public: @@ -616,7 +576,6 @@ private: }; - class VbaFormDesignExtObject : public AxPropertyObjectBase { public: @@ -627,7 +586,6 @@ protected: }; - class VbaFStreamObject : public AxPropertyObjectBase { public: @@ -653,7 +611,6 @@ private: }; - class VbaOStreamObject : public OleInputObjectBase { public: @@ -671,7 +628,6 @@ private: }; - class VbaPageObject : public AxPropertyObjectBase { public: @@ -682,7 +638,6 @@ protected: }; - class VbaMultiPageObject : public AxPropertyObjectBase { public: @@ -697,7 +652,6 @@ private: }; - class VbaXStreamObject : public InputObjectBase { public: @@ -715,7 +669,6 @@ private: }; - class VbaContainerStorageObject : public OleStorageObject { public: @@ -744,8 +697,6 @@ private: }; - - struct VbaSharedData { typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap; @@ -760,7 +711,6 @@ struct VbaSharedData }; - class VbaDirStreamObject : public SequenceRecordObjectBase { public: @@ -789,7 +739,6 @@ private: }; - class VbaModuleStreamObject : public InputObjectBase { public: @@ -809,7 +758,6 @@ private: }; - class VbaStorageObject : public OleStorageObject { public: @@ -831,7 +779,6 @@ private: }; - class VbaFormStorageObject : public VbaContainerStorageObject { public: @@ -853,7 +800,6 @@ private: }; - class VbaProjectStorageObject : public OleStorageObject { public: @@ -876,8 +822,6 @@ private: }; - - class ActiveXStorageObject : public VbaContainerStorageObject { public: @@ -893,8 +837,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 5390df05c0e7..9b0a14857b32 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -29,7 +29,6 @@ namespace dump { namespace pptx { - class RootStorageObject : public StorageObjectBase { public: @@ -44,7 +43,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -60,7 +58,6 @@ protected: }; - } // namespace pptx } // namespace dump } // namespace oox diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index a4651a1cabf5..1d8c28281249 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -36,7 +36,6 @@ namespace dump { namespace xlsb { - class RecordObjectBase : public SequenceRecordObjectBase { protected: @@ -55,7 +54,6 @@ private: }; - class RootStorageObject : public StorageObjectBase { public: @@ -70,7 +68,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -86,7 +83,6 @@ protected: }; - } // namespace xlsb } // namespace dump } // namespace oox diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index 427e4d63994b..2bde4a8807cc 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -34,7 +34,6 @@ namespace sax_fastparser { namespace oox { - /** Static helpers for conversion of strings to attribute values of various different data types. */ @@ -62,7 +61,6 @@ public: }; - /** Provides access to attribute values of an element. Wraps a com.sun.star.xml.sax.XFastAttributeList object. Provides @@ -170,7 +168,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 1baf584f0f75..afc48d3c6351 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { class BinaryOutputStream; - /** Interface for binary input stream classes. The binary data in the stream is assumed to be in little-endian format. @@ -204,7 +203,6 @@ private: typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; - template< typename Type > Type BinaryInputStream::readValue() { @@ -235,7 +233,6 @@ sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int } - /** Wraps a UNO input stream and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -283,7 +280,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -319,7 +315,6 @@ private: }; - /** Wraps a BinaryInputStream and provides access to a specific part of the stream data. @@ -386,7 +381,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index ae5496d924fe..4287441fb78c 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Interface for binary output stream classes. The binary data in the stream is written in little-endian format. @@ -114,7 +113,6 @@ void BinaryOutputStream::writeValue( Type nValue ) } - /** Wraps a UNO output stream and provides convenient access functions. The binary data in the stream is written in little-endian format. @@ -156,7 +154,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is written in little-endian format. After @@ -183,7 +180,6 @@ public: }; - } // namespace oox #endif diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 8492049283ce..e49eca63c601 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -34,7 +34,6 @@ namespace oox { typedef css::uno::Sequence< sal_Int8 > StreamDataSequence; - /** Base class for binary stream classes. */ class OOX_DLLPUBLIC BinaryStreamBase @@ -118,7 +117,6 @@ private: }; - /** Base class for binary input and output streams wrapping a UNO stream, seekable via the com.sun.star.io.XSeekable interface. */ @@ -146,7 +144,6 @@ private: }; - /** Base class for binary input and output streams wrapping a StreamDataSequence, which is always seekable. @@ -175,7 +172,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 1c73eb7ec98d..66d098f869ce 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** A range of signed 32-bit integer values. */ struct ValueRange { @@ -55,11 +54,9 @@ struct ValueRange }; - typedef ::std::vector< ValueRange > ValueRangeVector; - /** An ordered list of value ranges. The insertion operation will merge consecutive value ranges. */ @@ -79,7 +76,6 @@ private: }; - /** Template for a 2-dimensional array of objects. This class template provides a similar interface to the ::std::vector @@ -136,7 +132,6 @@ private: }; - /** Static helper functions for improved API container handling. */ class OOX_DLLPUBLIC ContainerHelper { @@ -267,7 +262,6 @@ public: }; - template< typename VectorType > /*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex ) { @@ -325,7 +319,6 @@ template< typename MatrixType > } - } // namespace oox #endif diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index ce0b3655621a..36f374805c33 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -46,7 +46,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Provides helper functions for colors, device measurement conversion, graphics, and graphic objects handling. @@ -165,7 +164,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 5029d5fa1d26..30525a86c8b0 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -75,7 +75,6 @@ const sal_uInt8 WINDOWS_CHARSET_EASTERN = 238; const sal_uInt8 WINDOWS_CHARSET_OEM = 255; - const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. const sal_uInt32 UNSIGNED_RGB_TRANSPARENT = static_cast<sal_uInt32>(-1); ///< Transparent color for unsigned int32 places. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. @@ -101,7 +100,6 @@ const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; ///< Relative character const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; ///< Relative character height if escaped. - // Limitate values ------------------------------------------------------------ template< typename ReturnType, typename Type > @@ -167,7 +165,6 @@ inline void setFlag( Type& ornBitField, Type nMask, bool bSet = true ) } - /** Optional value, similar to ::boost::optional<>, with convenience accessors. */ template< typename Type > @@ -201,7 +198,6 @@ private: }; - /** Provides platform independent functions to convert from or to little-endian byte order, e.g. for reading data from or writing data to memory or a binary stream. @@ -261,7 +257,6 @@ private: }; - template< typename Type > inline void ByteOrderConverter::writeLittleEndian( void* pDstBuffer, Type nValue ) { @@ -298,7 +293,6 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData ) #endif - } // namespace oox #endif diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 1f530fd6af48..85ce16808a7b 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** This helper manages named objects in a container, which is created on demand. */ class OOX_DLLPUBLIC ObjectContainer @@ -69,7 +68,6 @@ private: }; - /** Contains tables for named drawing objects for a document model. Contains tables for named line markers, line dashes, fill gradients, and @@ -121,7 +119,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index faabe22bec2b..2ee50a376426 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -57,8 +57,6 @@ public: }; - - class ISegmentProgressBar; typedef std::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; @@ -78,8 +76,6 @@ public: }; - - /** A simple progress bar. */ class OOX_DLLPUBLIC ProgressBar : public IProgressBar @@ -103,7 +99,6 @@ private: }; - /** A progress bar containing several independent segments. */ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar @@ -129,7 +124,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index 99412d145687..aa6696b0248e 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -38,7 +38,6 @@ namespace oox { struct PropertyNameVector; - typedef ::std::map< sal_Int32, css::uno::Any > PropertyMapType; typedef ::std::map< OUString, css::uno::Any > PropertyNameMap; @@ -118,7 +117,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index db1a5aa83226..669472a07b6d 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -30,7 +30,6 @@ namespace oox { class PropertyMap; - /** A wrapper for a UNO property set. This class provides functions to silently get and set properties (without @@ -138,7 +137,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index ef20d37acb94..d1784f73be5d 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -30,7 +30,6 @@ namespace oox { - /** Template for a map of ref-counted objects with additional accessor functions. An instance of the class RefMap< Type > stores elements of the type @@ -140,7 +139,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index 81920328d577..9fab74a97ccf 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -30,7 +30,6 @@ namespace oox { - /** Template for a vector of ref-counted objects with additional accessor functions. An instance of the class RefVector< Type > stores elements of the type @@ -157,7 +156,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index c1264d9eb11b..b953495fb094 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace oox { - class StorageBase; typedef std::shared_ptr< StorageBase > StorageRef; @@ -183,7 +182,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index 71018569c154..8412b77a53ba 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -34,7 +34,6 @@ namespace oox { class BinaryInputStream; - class TextInputStream { public: @@ -88,7 +87,6 @@ public: OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); - /** Creates a UNO text input stream object from the passed UNO input stream. */ static css::uno::Reference< css::io::XTextInputStream2 > @@ -114,7 +112,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 9b5328f74560..4e4236393cbd 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Implements stream access for ZIP storages containing XML streams. */ class ZipStorage : public StorageBase { @@ -80,7 +79,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 3d4e2a273150..5823fbb8ef19 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - /** A wrapper for a binary input stream that supports aligned read operations. The implementation does not support seeking back the wrapped stream. All @@ -83,7 +82,6 @@ private: }; - /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -91,7 +89,6 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; typedef ::std::vector< OUString > AxArrayString; - /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ class AxBinaryPropertyReader @@ -241,7 +238,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index a9c8eee451be..87b8515fa6a9 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -46,7 +46,6 @@ namespace oox { namespace ole { - #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" #define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}" @@ -55,7 +54,6 @@ const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; - #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" #define AX_GUID_IMAGE "{4C599241-6926-101B-9992-00000b65c6f9}" @@ -142,7 +140,6 @@ const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; - /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType { @@ -167,7 +164,6 @@ enum ApiControlType }; - /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode { @@ -185,7 +181,6 @@ enum ApiDefaultStateMode }; - /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. */ @@ -345,7 +340,6 @@ private: }; - /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase { @@ -392,7 +386,6 @@ protected: typedef std::shared_ptr< ControlModelBase > ControlModelRef; - /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase { @@ -434,7 +427,6 @@ private: }; - /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase { @@ -457,7 +449,6 @@ private: }; - /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase { @@ -478,7 +469,6 @@ private: }; - /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase { @@ -489,7 +479,6 @@ public: }; - /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase { @@ -513,7 +502,6 @@ private: }; - /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel { @@ -542,7 +530,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel { @@ -570,7 +557,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase { @@ -617,7 +603,6 @@ public: }; - /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel { @@ -654,7 +639,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase { @@ -668,7 +652,6 @@ public: }; - /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase { @@ -682,7 +665,6 @@ public: }; - /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase { @@ -699,7 +681,6 @@ public: }; - /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase { @@ -713,7 +694,6 @@ public: }; - /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase { @@ -727,7 +707,6 @@ public: }; - /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase { @@ -741,7 +720,6 @@ public: }; - /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase { @@ -755,7 +733,6 @@ public: }; - /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase { @@ -784,7 +761,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase { @@ -815,7 +791,6 @@ public: // direct access needed for legacy VML drawing controls }; - typedef ::std::vector< OUString > AxClassTable; /** Base class for ActiveX container controls. */ @@ -856,8 +831,6 @@ public: // direct access needed for legacy VML drawing controls }; - - /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase { @@ -891,8 +864,6 @@ public: }; - - /** Model for a Forms 2.0 user form. */ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase { @@ -966,7 +937,6 @@ private: }; - template< typename ModelType > inline ModelType& EmbeddedControl::createModel() { @@ -986,7 +956,6 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) } - /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm { @@ -1019,7 +988,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 7964e55225cd..b4284cf892e7 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -29,7 +29,6 @@ class ControlModelBase; class EmbeddedControl; - /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 { @@ -47,7 +46,6 @@ private: }; - /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 { @@ -65,7 +63,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index c8e764e997cc..05694fbcd12e 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; const sal_uInt32 AX_FONTDATA_BOLD = 0x00000001; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 12ae732ebf6c..0a6ba4a76302 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -56,13 +56,10 @@ namespace oox { namespace ole { - - #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" - const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -89,7 +86,6 @@ struct StdFontInfo }; - /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo { @@ -99,7 +95,6 @@ struct StdHlinkInfo }; - /** Static helper functions for OLE import/export. */ namespace OleHelper { @@ -170,8 +165,6 @@ public: }; - - } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 85b9ee59c022..0947ad1f9447 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -36,7 +36,6 @@ namespace oox { namespace ole { - /** Contains generic information about an OLE object. */ struct OOX_DLLPUBLIC OleObjectInfo { @@ -51,7 +50,6 @@ struct OOX_DLLPUBLIC OleObjectInfo }; - /** Helper for OLE object handling. */ class OleObjectHelper { diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 6b00ada1b61a..9039cae2dedb 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ole { - /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase { @@ -101,7 +100,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 7d4a4bbe1d93..a50054e5f5c2 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -34,7 +34,6 @@ namespace oox { namespace ole { - /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ class VbaSiteModel @@ -95,7 +94,6 @@ protected: typedef std::shared_ptr< VbaSiteModel > VbaSiteModelRef; - /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -172,7 +170,6 @@ private: }; - class VbaUserForm : public VbaFormControl { public: @@ -197,7 +194,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index 75ad1b57e1a9..94a63efe34a8 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -50,7 +50,6 @@ const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; - /** Static helper functions for the VBA filters. */ namespace VbaHelper { @@ -84,7 +83,6 @@ namespace VbaHelper } - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index 393f517c06b4..dd6e53ad6a9a 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -27,7 +27,6 @@ namespace oox { namespace ole { - /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream { @@ -65,7 +64,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 9fa2de0408fe..68aef13e82e1 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -39,7 +39,6 @@ namespace oox { namespace ole { - class VbaModule { public: @@ -100,7 +99,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9478c9adde96..e4ed68255bdb 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -42,7 +42,6 @@ namespace oox { namespace ole { - class OOX_DLLPUBLIC VbaFilterConfig { public: @@ -64,7 +63,6 @@ private: }; - /** Base class for objects that attach a macro to a specific action. Purpose is to collect objects that need to attach a VBA macro to an action. @@ -105,7 +103,6 @@ private: typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; - class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { public: @@ -204,7 +201,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index c4165a1abe06..cbf0070f325f 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -120,9 +120,6 @@ namespace oox { namespace ppt { } } - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index c1106ef23f38..4df7a3081e49 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -26,7 +26,6 @@ namespace oox { namespace ppt { - class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { public: diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 531ab6c2dea8..7272eeeb8c4e 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 9dcd8ae6fda9..0ba4d53ae5b2 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingLayout : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 9908177ea9f4..125030381f70 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class PowerPointImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index 4b3bd9fee30b..51e0e0da0890 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -47,7 +47,6 @@ private: } } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index af0d6f6cba07..5406771013fd 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -43,7 +43,6 @@ namespace oox { namespace ppt { }; - /** FastParser context for XML_tnLst, XML_subTnLst and XML_childTnLst */ class TimeNodeListContext : public ::oox::core::FragmentHandler2 { diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index 46c89d658b80..a17e8cc98ff6 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap { @@ -44,7 +43,6 @@ struct NamespaceMap struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; - } // namespace oox #endif diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index 3d0c8db6134c..6419b57f70c1 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A vector that contains all predefined property names used in the filters. */ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; @@ -35,7 +34,6 @@ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVecto struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; - } // namespace oox #endif diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index 686b8316284c..83ce4cfa5d96 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -30,7 +30,6 @@ namespace oox { - class TokenMap { public: @@ -82,11 +81,9 @@ private: }; - struct StaticTokenMap : public ::rtl::Static< TokenMap, StaticTokenMap > {}; - } // namespace oox #endif diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ad34652a1d79..ad1462a812eb 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -48,7 +48,6 @@ class ShapeBase; struct ClientData; - /** Enumerates different types of VML drawings. */ enum DrawingType { @@ -58,7 +57,6 @@ enum DrawingType }; - /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo { @@ -89,7 +87,6 @@ struct OOX_DLLPUBLIC ControlInfo }; - /** Represents the collection of VML shapes for a complete draw page. */ class OOX_DLLPUBLIC Drawing { @@ -202,7 +199,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index 7e0d4c474a46..c2e82d4aae71 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -29,7 +29,6 @@ namespace vml { class Drawing; - class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 { public: @@ -51,7 +50,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index 8df59acf4eaf..2e212a52eb6f 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -38,12 +38,10 @@ namespace oox { namespace vml { - typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; typedef ::std::pair< double, double > DoublePair; - namespace ConversionHelper { /** Returns two values contained in rValue separated by cSep. @@ -158,7 +156,6 @@ namespace ConversionHelper } - /** The stroke arrow model structure contains all properties for an line end arrow. */ struct StrokeArrowModel { @@ -170,7 +167,6 @@ struct StrokeArrowModel }; - /** The stroke model structure contains all shape border properties. */ struct StrokeModel { @@ -194,7 +190,6 @@ struct StrokeModel }; - /** The fill model structure contains all shape fill properties. */ struct OOX_DLLPUBLIC FillModel { @@ -220,7 +215,6 @@ struct OOX_DLLPUBLIC FillModel }; - /** The shadow model structure contains all shape shadow properties. */ struct OOX_DLLPUBLIC ShadowModel { diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 0197cff6278e..4fc6dc9e9fc9 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { namespace vml { - /** An input stream class for VML streams, implementing the UNO interface com.sun.star.io.XInputStream needed by the Expat XML parsers. @@ -87,7 +86,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 927f8c1ab9ad..631359103952 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -41,7 +41,6 @@ struct ShapeParentAnchor; class ShapeContainer; - const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_CHECKED = 1; const sal_Int32 VML_CLIENTDATA_MIXED = 2; @@ -53,7 +52,6 @@ const sal_Int32 VML_CLIENTDATA_REFERENCE = 3; const sal_Int32 VML_CLIENTDATA_FORMULA = 4; - /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel { @@ -112,7 +110,6 @@ struct OOX_DLLPUBLIC ShapeTypeModel }; - /** A shape template contains all formatting properties of shapes and can serve as templates for several shapes in a drawing. */ class ShapeType @@ -151,7 +148,6 @@ protected: }; - /** Excel specific shape client data (such as cell anchor). */ struct ClientData { @@ -189,7 +185,6 @@ struct ClientData }; - struct ShapeModel { typedef ::std::vector< css::awt::Point > PointVector; @@ -217,7 +212,6 @@ struct ShapeModel }; - /** A shape object that is part of a drawing. May inherit properties from a shape template. */ class OOX_DLLPUBLIC ShapeBase : public ShapeType @@ -278,7 +272,6 @@ protected: }; - /** A simple shape object based on a specific UNO shape service. */ class SimpleShape : public ShapeBase { @@ -303,7 +296,6 @@ private: }; - /** A rectangular shape object. */ class RectangleShape : public SimpleShape { @@ -318,7 +310,6 @@ protected: }; - /** An oval shape object. */ class EllipseShape : public SimpleShape { @@ -327,7 +318,6 @@ public: }; - /** A polygon shape object. */ class PolyLineShape : public SimpleShape { @@ -371,7 +361,6 @@ protected: }; - /** A shape object with custom geometry. */ class CustomShape : public SimpleShape { @@ -387,7 +376,6 @@ protected: }; - /** A complex shape object. This can be a picture shape, a custom shape, an OLE object, or an ActiveX form control. */ class ComplexShape : public CustomShape @@ -404,7 +392,6 @@ protected: }; - /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase { @@ -438,7 +425,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index b843c4d73f00..9f99f3974b12 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -37,7 +37,6 @@ class ShapeType; class ShapeBase; - struct ShapeParentAnchor { css::awt::Rectangle maShapeRect; @@ -45,7 +44,6 @@ struct ShapeParentAnchor }; - /** Container that holds a list of shapes and shape templates. */ class ShapeContainer { @@ -118,7 +116,6 @@ private: }; - template< typename ShapeT > ShapeT& ShapeContainer::createShape() { @@ -134,7 +131,6 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const } - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 194a66c600aa..4636b0fdbc5c 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -39,7 +39,6 @@ class RectangleShape; class ShapeContainer; - class ShapeLayoutContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class ClientDataContext : public ::oox::core::ContextHandler2 { public: @@ -75,7 +73,6 @@ private: }; - class ShapeContextBase : public ::oox::core::ContextHandler2 { public: @@ -91,7 +88,6 @@ protected: }; - class ShapeTypeContext : public ShapeContextBase { public: @@ -115,7 +111,6 @@ private: }; - class ShapeContext : public ShapeTypeContext { public: @@ -149,7 +144,6 @@ private: }; - class GroupShapeContext : public ShapeContext { public: @@ -166,7 +160,6 @@ private: }; - class RectangleShapeContext : public ShapeContext { public: diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index 1aa06db3f484..1c7ff8e2db3c 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -36,7 +36,6 @@ namespace vml { struct ShapeTypeModel; - /// A text paragraph in a textbox. struct TextParagraphModel { @@ -60,7 +59,6 @@ struct OOX_DLLPUBLIC TextFontModel }; - /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel { @@ -72,7 +70,6 @@ struct TextPortionModel }; - /** The textbox contains all text contents and properties. */ class OOX_DLLPUBLIC TextBox { @@ -104,7 +101,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index 770a6f015861..7d90e43e1c3a 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -29,7 +29,6 @@ namespace oox { namespace vml { - class TextPortionContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class TextBoxContext : public ::oox::core::ContextHandler2 { public: @@ -76,7 +74,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 7e09e9052c9d..952e53a0d777 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -41,7 +41,6 @@ namespace osl { - /** Base class for all File System specific objects. @see Directory @@ -322,7 +321,6 @@ public: }; - /** The VolumeDevice class. @see VolumeInfo @@ -400,7 +398,6 @@ public: }; - class Directory; /** The VolumeInfo class. @@ -897,7 +894,6 @@ public: }; - /** The file class object provides access to file contents and attributes. @see Directory @@ -1605,7 +1601,6 @@ public: }; - /** Base class for observers of directory creation notifications. Clients which uses the method createDirectoryPath of the class diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx index 380ef3f840c3..b4012cca76f8 100644 --- a/include/osl/socket.hxx +++ b/include/osl/socket.hxx @@ -437,7 +437,6 @@ namespace osl } - inline sal_Int32 StreamSocket::recv(void* pBuffer, sal_uInt32 BytesToRead, oslSocketMsgFlag Flag) diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx index facad546ba4a..1913956da191 100644 --- a/include/osl/socket_decl.hxx +++ b/include/osl/socket_decl.hxx @@ -651,7 +651,6 @@ namespace osl }; - /** A connectionless socket to send and receive datagrams. */ class DatagramSocket : public Socket diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 2ae5eb8b6079..8b75a5ec67e6 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -81,7 +81,6 @@ REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(); class RegistryKey; - /** The Registry provides the functionality to read and write information in a registry file. The class is implemented inline and use a C-Api. @@ -185,8 +184,6 @@ protected: }; - - /** RegistryKeyArray represents an array of open keys. RegistryKeyArray is a helper class to work with an array of keys. @@ -263,7 +260,6 @@ protected: }; - /** RegistryValueList represents a value list of the specified type. RegistryValueList is a helper class to work with a list value. @@ -337,7 +333,6 @@ protected: }; - /** RegistryKey reads or writes information of the underlying key in a registry. Class is inline and use a load on call C-Api. @@ -599,8 +594,6 @@ protected: }; - - inline RegistryKeyArray::RegistryKeyArray() : m_length(0) , m_phKeys(nullptr) @@ -1022,7 +1015,6 @@ inline rtl::OUString RegistryKey::getRegistryName() } - inline Registry::Registry() : m_pApi(initRegistry_Api()) , m_hImpl(nullptr) diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx index 65983cc32ac2..499f3b86f7d1 100644 --- a/include/salhelper/condition.hxx +++ b/include/salhelper/condition.hxx @@ -58,7 +58,6 @@ namespace salhelper }; - class SALHELPER_DLLPUBLIC ConditionModifier { public: @@ -76,7 +75,6 @@ namespace salhelper }; - class SALHELPER_DLLPUBLIC ConditionWaiter { public: diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 2eee3935f016..c1535334fb2c 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -90,7 +90,6 @@ protected: }; - } // namespace salhelper #endif /* ! INCLUDED_SALHELPER_REFOBJ_HXX */ diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index 52e54a513dc5..6b96d3e3f452 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -85,7 +85,6 @@ class SingletonRef public: - /** @short standard ctor. The internal wrapped object is created only, @@ -109,7 +108,6 @@ class SingletonRef } - /** @short standard dtor. The internal wrapped object is removed only, @@ -134,7 +132,6 @@ class SingletonRef } - /** @short Allows rSingle->someBodyOp(). */ SingletonClass* operator->() const @@ -146,7 +143,6 @@ class SingletonRef } - /** @short Allows (*rSingle).someBodyOp(). */ SingletonClass& operator*() const @@ -163,7 +159,6 @@ class SingletonRef private: - /** @short creates an own mutex for guarding static contents. The global mutex the osl library is used one times diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index 206cae8218d2..0325513e3b52 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -38,7 +38,6 @@ class XFastTokenHandler; namespace sax_fastparser { - class FastSaxParserImpl; // This class implements the external Parser interface diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 413ce7ebd9a5..186e6b6c5668 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -225,11 +225,6 @@ public: #endif - - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index a01b9d114a1f..d56e7f26aba8 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -34,11 +34,9 @@ #include <svtools/ctrlbox.hxx> - namespace sfx { - /** List position type of VCL ListBox. */ typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ @@ -212,7 +210,6 @@ private: }; - /** A dummy wrapper for a VCL Window that does nothing special. This wrapper is used to implement the DummyItemConnection. It does not @@ -233,7 +230,6 @@ public: }; - /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: public SingleControlWrapper< CheckBox, bool > @@ -249,7 +245,6 @@ public: }; - /** A wrapper for the SVTOOLS ColorListBox. */ class SFX2_DLLPUBLIC ColorListBoxWrapper: public SingleControlWrapper< ColorListBox, Color > @@ -270,7 +265,6 @@ public: }; - /** A wrapper for the VCL NumericField. */ template< typename ValueT > class NumericFieldWrapper : public SingleControlWrapper< NumericField, ValueT > @@ -287,11 +281,6 @@ public: }; - - - - - /** A wrapper for the VCL MetricField. Adds support for field units during accessing the control value. The @@ -316,8 +305,6 @@ private: }; - - #define WRAPPER_LISTBOX_ENTRY_NOTFOUND 0xFFFF /* XXX was value of LISTBOX_ENTRY_NOTFOUND */ /** A wrapper for the VCL ListBox. @@ -351,11 +338,6 @@ public: }; - - - - - #define WRAPPER_VALUESET_ITEM_NOTFOUND 0xFFFF /* XXX was value of VALUESET_ITEM_NOTFOUND */ /** A wrapper for the SVTOOLS ValueSet. @@ -389,10 +371,6 @@ public: }; - - - - // Multi control wrappers @@ -428,7 +406,6 @@ private: }; - /** A multi control wrapper with extended interface. This template class extends the MultiControlWrapperHelper class by the @@ -465,13 +442,9 @@ private: }; - - - // *** Implementation of template functions *** - // Helpers @@ -525,7 +498,6 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE } - template< typename ValueT > bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -552,7 +524,6 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -579,7 +550,6 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const { @@ -595,7 +565,6 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ValueSetWrapper< ValueT >::GetControlValue() const { @@ -611,8 +580,6 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) } - - } // namespace sfx #endif diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index c333c94cf972..45c4fcc45578 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -84,7 +84,6 @@ public: }; - class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem { SfxControllerItem* pMaster; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 7011f93ece4d..ebe2e198c344 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= IMacroDocumentAccess /** provides access to several settings of a document, which are needed by ->DocumentMacroMode diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index e2ec5b47cc6b..4a4374d4a4e4 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -33,7 +33,6 @@ namespace sfx2 { - //= IModifiableDocument /** callback for the DocumentStorageModifyListener class diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 079a13aafc54..37a71b338015 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -34,7 +34,6 @@ class SfxObjectShell; - class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; @@ -59,7 +58,6 @@ public: }; - class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint { css::uno::Reference< css::frame::XController2 > xViewController; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 7b4af17d661c..98d231d02ac1 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -90,7 +90,6 @@ public: }; - #define PROP_EVENT_TYPE "EventType" #define PROP_LIBRARY "Library" #define PROP_SCRIPT "Script" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 82a7a0cf9a29..0111f5e92577 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -207,7 +207,6 @@ public: }; - class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 590ec7f8d0b7..f94d70608e6d 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -37,7 +37,6 @@ class SfxObjectShell; class Fraction; - class SFX2_DLLPUBLIC SfxInPlaceClient { friend class SfxInPlaceClient_Impl; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index a414b461415c..95cc97f9f229 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -213,7 +213,6 @@ private: }; - /** Base class template for single item <-> single control connection objects. This template uses functions provided by the SingleItemWrapper and the @@ -290,12 +289,10 @@ private: }; - /** Connection between an SfxBoolItem and a VCL CheckBox. */ typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection; - /** Connection between an item and the VCL NumericField. */ template< typename ItemWrpT > class NumericConnection : public ItemControlConnection< ItemWrpT, @@ -313,10 +310,6 @@ public: }; - - - - /** Connection between an item and the VCL MetricField. Adds support of different field units during control value <-> item value @@ -340,7 +333,6 @@ public: }; - /** Connection between an item and a VCL ListBox. Optionally a map can be passed that maps list box positions to item values. @@ -366,10 +358,6 @@ public: }; - - - - /** Connection between an item and an SVTOOLS ValueSet. Optionally a map can be passed that maps value set identifiers to item @@ -395,9 +383,6 @@ public: }; - - - // Array of connections @@ -430,12 +415,9 @@ private: }; - - // *** Implementation of template functions *** - // Base connection classes @@ -519,7 +501,6 @@ NumericConnection< ItemWrpT >::NumericConnection( } - template< typename ItemWrpT > MetricConnection< ItemWrpT >::MetricConnection( sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) : @@ -528,7 +509,6 @@ MetricConnection< ItemWrpT >::MetricConnection( } - template< typename ItemWrpT > ListBoxConnection< ItemWrpT >::ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) : @@ -537,7 +517,6 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection( } - template< typename ItemWrpT > ValueSetConnection< ItemWrpT >::ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) : @@ -546,7 +525,6 @@ ValueSetConnection< ItemWrpT >::ValueSetConnection( } - } // namespace sfx #endif diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 92ac1a05fb7f..64fbf6d22824 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -28,7 +28,6 @@ #include <svl/itemset.hxx> - namespace sfx { @@ -118,7 +117,6 @@ private: }; - /** An item wrapper usable for most types of items. The item type must support the following functions: @@ -145,13 +143,11 @@ public: }; - typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; - /** An item wrapper that uses the item itself as value. */ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > @@ -169,13 +165,9 @@ public: }; - - - // *** Implementation of template functions *** - // Item wrappers @@ -192,7 +184,6 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe } - } // namespace sfx #endif diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 5f51b064690e..46349955011f 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -63,7 +63,6 @@ public: }; - class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 97313d06ff30..f00b94b3c804 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -84,7 +84,6 @@ class SfxRequest; #define SFX_STUB_PTR_STATE_NONE &SfxShell::EmptyStateStub - enum class SfxSlotKind { Standard, @@ -93,7 +92,6 @@ enum class SfxSlotKind }; - struct SfxTypeAttrib { sal_uInt16 nAID; @@ -204,7 +202,6 @@ struct SfxFormalArgument }; - class SfxSlot { public: @@ -257,7 +254,6 @@ public: }; - // returns the id of the function inline sal_uInt16 SfxSlot::GetSlotId() const diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 4308418ac1b2..7ea00d1fe75c 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -65,7 +65,6 @@ public: }; - // seeks to the first func in the current group inline const SfxSlot* SfxSlotPool::FirstSlot() diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 8c02ba274928..56a7c2f865a8 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -30,12 +30,10 @@ #include <o3tl/typed_flags_set.hxx> - class SfxObjectShellLock; class SfxObjectShell; - #define SFXWB_PREVIEW 0x0003 #define SFXWB_LOAD_TEMPLATE 0x0004 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 22b28a37304c..7ca1b97d4c89 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -92,7 +92,6 @@ public: }; - // returns the number of functions in this cluster inline sal_uInt16 SfxInterface::Count() const @@ -101,7 +100,6 @@ inline sal_uInt16 SfxInterface::Count() const } - // returns a function by position in the array inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index db4139285f44..b07478c318ef 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -26,7 +26,6 @@ #include <sfx2/shell.hxx> - class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { SfxShell* _pSh; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 675d5711e8ce..289d57dc65f2 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -30,7 +30,6 @@ class SfxViewShell; - struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog { diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 13c52aa831e4..99f42dcab468 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -56,7 +56,6 @@ private: SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet ); - public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool ); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index cc0eb949913e..cfb28f1443b8 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -25,7 +25,6 @@ #include <memory> - struct SfxSecurityPage_Impl; class SfxSecurityPage : public SfxTabPage diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 834443fecff2..638d9e8f1e75 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -241,7 +241,6 @@ public: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override ; - // XStarBasicAccess @@ -272,7 +271,6 @@ public: throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - // XChild @@ -428,8 +426,6 @@ public: throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - - // XLoadable @@ -545,7 +541,6 @@ public: throw (css::uno::RuntimeException, std::exception) override; - // XEventsSupplier @@ -558,7 +553,6 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) override; - // XEmbeddedScripts @@ -661,7 +655,6 @@ public: virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; - // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 38d9d145d7f1..a9da7f680f92 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -270,7 +270,6 @@ private: }; - } } // end of namespace sfx2::sidebar #endif diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 43eb733a249d..8ec6cc13ae10 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -52,7 +52,6 @@ struct SfxStbCtrlFactory }; - class CommandEvent; class MouseEvent; class UserDrawEvent; @@ -120,7 +119,6 @@ public: }; - #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index b971be938910..571242ae284c 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -60,8 +60,6 @@ struct SfxTbxCtrlFactory }; - - /* Floating windows that can be torn from tool boxes should be derived from this class. Since it is also derived from SfxControllerItem, its instances will also receive the StateChanged calls. @@ -131,7 +129,6 @@ public: }; - #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) @@ -242,8 +239,6 @@ public: Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } - - class SfxDragButton_Impl : public FixedImage { public: diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 54462aafd34c..737e5330802e 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= UserInputInterception struct UserInputInterception_Data; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 6c4d090d43b3..9497e86a2693 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -270,7 +270,6 @@ private: }; - class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { SfxViewFrame* pFrame; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index c5e5a6380bad..466ced7776dd 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -89,7 +89,6 @@ namespace o3tl #define DEFAULT_MARGIN_HEIGHT 12 - // @[SfxViewShell-Flags] enum class SfxViewShellFlags @@ -113,7 +112,6 @@ namespace o3tl */ - #define SFX_DECL_VIEWFACTORY(Class) \ private: \ static SfxViewFactory *pFactory; \ @@ -331,7 +329,6 @@ public: }; - inline SfxViewFrame* SfxViewShell::GetViewFrame() const /* [Description] diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index d595b7ec24d9..84632ea96643 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -80,7 +80,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/store/store.hxx b/include/store/store.hxx index 050e9b732ba4..e463a3608b45 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -386,6 +386,4 @@ private: #endif /* ! INCLUDED_STORE_STORE_HXX */ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 8d1e04bdb267..184cb4ca9847 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -62,7 +62,6 @@ public: }; - #endif // INCLUDED_SVL_CNTWALL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx index 82d22154b66a..0aeceeac2132 100644 --- a/include/svl/converter.hxx +++ b/include/svl/converter.hxx @@ -31,5 +31,4 @@ public: #endif //_CONVERTER_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 52cd22e1891b..746da66655fe 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -23,7 +23,6 @@ #include <svl/custritm.hxx> - class CntContentTypeItem : public CntUnencodedStringItem { private: diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index b4f6f083c052..599a5c1c9635 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -24,7 +24,6 @@ #include <svl/cenumitm.hxx> - class SVL_DLLPUBLIC SfxEnumItem : public SfxEnumItemInterface { @@ -59,7 +58,6 @@ public: }; - class SVL_DLLPUBLIC SfxBoolItem : public SfxPoolItem { diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx index bfee7570bf68..4c99f834a56f 100644 --- a/include/svl/filenotation.hxx +++ b/include/svl/filenotation.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFileNotation class SVL_DLLPUBLIC OFileNotation diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index e7541c1d2bc7..41dc76f01b2a 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -26,7 +26,6 @@ class SfxItemSet; - class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint { SfxItemSet* _pItemSet; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 827129393b1e..37f3f419a62c 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -35,7 +35,6 @@ namespace comphelper } - // SvNumberFormatterServiceObj must be registered as service somewhere css::uno::Reference<css::uno::XInterface> SAL_CALL @@ -43,7 +42,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); - // SvNumberFormatsSupplierObj: aggregate to document, // construct with SvNumberFormatter diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 4291dd04c1bf..7e855f17aff4 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -29,7 +29,6 @@ namespace svt { - SVL_DLLPUBLIC void addFolderPicker( const css::uno::Reference< css::uno::XInterface >& _rxPicker ); diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 3170df70b5c1..a8855de98a7e 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -26,7 +26,6 @@ class SvStream; - class SVL_DLLPUBLIC SfxRangeItem : public SfxPoolItem { private: @@ -49,7 +48,6 @@ public: }; - class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem { private: diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 82173676de2e..79814cc2d3b9 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -297,7 +297,6 @@ public: }; - enum SfxStyleSheetHintId { CREATED = 1, // new @@ -314,7 +313,6 @@ public: }; - class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint { SfxStyleSheetBase* pStyleSh; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 3aac88f79965..0dce8073f855 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -34,7 +34,6 @@ public: }; - class SVL_DLLPUBLIC SfxUndoContext { public: @@ -75,7 +74,6 @@ private: }; - /// is a mark on the Undo stack typedef sal_Int32 UndoStackMark; #define MARK_INVALID ::std::numeric_limits< UndoStackMark >::max() @@ -119,7 +117,6 @@ struct SVL_DLLPUBLIC SfxUndoArray }; - /** do not make use of these implementation details, unless you really really have to! */ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray @@ -159,7 +156,6 @@ public: }; - /** is a callback interface for notifications about state changes of an SfxUndoManager */ class SAL_NO_VTABLE SfxUndoListener @@ -181,7 +177,6 @@ protected: }; - namespace svl { class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI IUndoManager @@ -295,7 +290,6 @@ namespace svl } - namespace svl { namespace undo { namespace impl { class UndoManagerGuard; @@ -399,7 +393,6 @@ private: }; - class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction /* [Explanation] diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx index 2b4f45fae2e0..33e54331ebd8 100644 --- a/include/svtools/AccessibleBrowseBoxObjType.hxx +++ b/include/svtools/AccessibleBrowseBoxObjType.hxx @@ -22,11 +22,9 @@ #define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX - namespace svt { - /** This enumeration contains a constant for each kind of accessible object of a BrowseBox. */ enum AccessibleBrowseBoxObjType @@ -42,11 +40,9 @@ enum AccessibleBrowseBoxObjType }; - } // namespace svt - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index da67bf0c884e..3406a26ba19c 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -40,7 +40,6 @@ namespace svt { - // = AddressBookSourceDialog struct AddressBookSourceDialogData; @@ -136,7 +135,6 @@ namespace svt }; - } // namespace svt diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 65ca905ab382..847e0711742e 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -28,7 +28,6 @@ namespace svt { - //= GraphicAccess /** helper class for obtaining streams (which also can be used with the ImageProducer) diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 71e8c8c66af5..08fe07b1fbe3 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -26,7 +26,6 @@ class BrowseBox; - class SVT_DLLPUBLIC BrowserHeader: public HeaderBar { VclPtr<BrowseBox> _pBrowseBox; diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 693f8bb7f451..bfc01fe84610 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -30,7 +30,6 @@ namespace svt { - //= ODialogClosedListener /** diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index d1b488754080..5067dac0576d 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -32,7 +32,6 @@ namespace svt { - //= IWindowOperator /** an abstract interface for operating on a ->Window diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 66dc7cb0fd78..ea3be15c9754 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -24,12 +24,10 @@ #include <rtl/ustring.hxx> - namespace svt { - /** This abstract class provides methods to implement an extension list box. This header is needed for the automatic test tool */ @@ -54,7 +52,6 @@ public: } // namespace svt - #endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 835c3413b4e1..5c9cc0dbf0fc 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -28,7 +28,6 @@ namespace svt { - //= FileURLBox class SVT_DLLPUBLIC FileURLBox : public SvtURLBox diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 6627b1d81ad7..77cc78a88511 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -61,5 +61,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 15ebdec6be15..e14b1de56b78 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -49,7 +49,6 @@ namespace svt { - #define UNODIALOG_PROPERTY_ID_TITLE 1 #define UNODIALOG_PROPERTY_ID_PARENT 2 @@ -57,7 +56,6 @@ namespace svt #define UNODIALOG_PROPERTY_PARENT "ParentWindow" - typedef ::cppu::WeakImplHelper3 < css::ui::dialogs::XExecutableDialog , css::lang::XServiceInfo , css::lang::XInitialization diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 9a84eb86519c..d0d2be7dca65 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -83,6 +83,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 0a2868d35504..2035ad66abc1 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -27,7 +27,6 @@ #define LABELBASEMAPHEIGHT 8 - namespace svt { diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index 845bc43f0380..99be3b08ea27 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -31,7 +31,6 @@ namespace svt { - //= GraphicAccess /** helper class for obtaining streams (which also can be used with the ImageProducer) diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index 2d7f4756f1a0..cf227635abc2 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -26,7 +26,6 @@ class SvData; class SotDataObject; - class INetImage { OUString aImageURL; diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index d0ebc4365f41..f38b1d31d704 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -29,7 +29,6 @@ namespace svt { - //= OLocalResourceAccess /** helper class for acessing local resources diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 7195e670a89d..2b8e882bfa7f 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -32,8 +32,6 @@ class Size; class Point; - - /** This class provides drawing text with different script types on any output devices. */ @@ -89,7 +87,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index bba9f6e7f0fa..d12a6f9e56fa 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.hxx @@ -68,7 +68,6 @@ #define ERRCTX_SO_DOVERB 1 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 401a415624cc..65a7bc1ae8a5 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OStringTransferable class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index aa2aef2cee27..1918dd28bff4 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -69,7 +69,6 @@ DeactivatePage - Is called, when a page is deactivated. If another page deactivated. - Drag and Drop ------------- diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index 53ded6366d52..eb3f47858794 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -33,7 +33,6 @@ namespace svt { namespace table { - //= ITableRenderer /** interface to implement by components rendering a ->TableControl diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx index cd9d164a3165..96a8ba440429 100644 --- a/include/svtools/table/tablesort.hxx +++ b/include/svtools/table/tablesort.hxx @@ -27,7 +27,6 @@ namespace svt { namespace table { - //= ColumnSortDirection enum ColumnSortDirection diff --git a/include/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx index 8c7258f71a4f..727ab2368c61 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/include/svtools/table/tabletypes.hxx @@ -55,7 +55,6 @@ namespace svt { namespace table #define ROW_INVALID ((::svt::table::RowPos)-2) - } } // namespace svt::table diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index 9319ceb7f5ce..886a731ca49f 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -29,7 +29,6 @@ namespace svt { - //= TemplateFolderCache class TemplateFolderCacheImpl; diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 899b2bbdeef1..a29b9d217cf1 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -153,8 +153,6 @@ protected: }; - - /** * SvEventDescriptor: Implement the XNameReplace that is delivered by * the XEventsSupplier::getEvents() method. The SvEventDescriptor has diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index c5fc70c2c86f..e97d6d8fba04 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFileURLControl class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index e9b7ab2af541..cbb1ee2f6565 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -30,7 +30,6 @@ namespace vcl { class Window; } - class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { css::uno::Reference< css::awt::XWindow > m_xWin; @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index d9f7ff9c2105..f43517931963 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -27,7 +27,6 @@ namespace accessibility { - /** <p>This interface provides the means to transform between internal coordinates in 100th of mm and screen coordinates without giving direct access to the underlying view. Each view forwarder represents a diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index 83429963b7d6..8a1794ede563 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -74,5 +74,4 @@ namespace svxform #endif // INCLUDED_SVX_PARSECONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/anchorid.hxx b/include/svx/anchorid.hxx index ab4e1bb0e69e..921769cd5ecc 100644 --- a/include/svx/anchorid.hxx +++ b/include/svx/anchorid.hxx @@ -30,7 +30,6 @@ enum SvxAnchorIds }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index 9ce8f53e0560..a534f6d90198 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -33,7 +33,6 @@ namespace svx { - //= DatabaseLocationInputController class DatabaseLocationInputController_Impl; diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index c5a2aa5f1fa4..cebac706c861 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -33,7 +33,6 @@ namespace svx { - //= OComponentTransferable class SAL_WARN_UNUSED SVX_DLLPUBLIC OComponentTransferable : public TransferableHelper diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index eee778321cdc..68d8f20c86c1 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -30,7 +30,6 @@ class NumericField; namespace svx { - class SAL_WARN_UNUSED DialControlBmp : public VirtualDevice { public: diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index ac2acebf42c8..234623dde9d6 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -108,7 +108,6 @@ enum SvxModeType #define TABFILL_ALL 0x01F0 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 9fe961b3452a..fceab28fb4bf 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -524,7 +524,6 @@ protected: }; - #endif // _SVX_FMGRID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx index ab6beaad1c3d..55dbdf9f7b6e 100644 --- a/include/svx/fmsrccfg.hxx +++ b/include/svx/fmsrccfg.hxx @@ -25,7 +25,6 @@ #include <svx/svxdllapi.h> - #define MATCHING_ANYWHERE 0 #define MATCHING_BEGINNING 1 #define MATCHING_END 2 @@ -37,12 +36,10 @@ // to be adapted) - namespace svxform { - // = struct FmSearchParams - parameters of a search @@ -140,8 +137,6 @@ namespace svxform } - - #endif // INCLUDED_SVX_FMSRCCFG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx index acd2cfd3f2bc..e570508464a8 100644 --- a/include/svx/fntctl.hxx +++ b/include/svx/fntctl.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - class FontNameMenu; class SfxBindings; diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx index 2ac3ad77ea7a..2919f8e3469c 100644 --- a/include/svx/fntszctl.hxx +++ b/include/svx/fntszctl.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - class SfxBindings; class FontSizeMenu; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index 1b5ff867139f..eec5eafbc5e2 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -26,7 +26,6 @@ #include <svx/svxdllapi.h> - /** A list box string item which stores its text and font. */ class SAL_WARN_UNUSED SvLBoxFontString : public SvLBoxString { @@ -56,8 +55,6 @@ public: }; - - /** A list box supporting formatted string entries. */ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox { diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index d1a238b7619c..bc339c7cdb8f 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -44,7 +44,6 @@ class SdrModel; class SfxBindings; - namespace svx { diff --git a/include/svx/framebordertype.hxx b/include/svx/framebordertype.hxx index afc05e616d1a..fa4385d246b6 100644 --- a/include/svx/framebordertype.hxx +++ b/include/svx/framebordertype.hxx @@ -25,7 +25,6 @@ namespace svx { - /** Enumerates all borders a frame selection control can contain. */ enum FrameBorderType { @@ -50,7 +49,6 @@ SVX_DLLPUBLIC FrameBorderType GetFrameBorderTypeFromIndex( size_t nIndex ); size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); - } #endif diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 1638459f1e90..752f81890351 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -177,7 +177,6 @@ inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } - /** Extends the Style struct with an angle for diagonal frame borders. The angle is specified in radian (a full circle is equivalent to 2*PI). @@ -223,7 +222,6 @@ inline double GetHorDiagAngle( const Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - /** Returns the angle between vertical border of a rectangle and its diagonal. The returned values represents the inner angle between the diagonals and @@ -242,7 +240,6 @@ inline double GetVerDiagAngle( const Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - /** Returns an X coordinate for a diagonal frame border in the specified height. This function is for usage with the top-left end of a top-left to @@ -358,7 +355,6 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); - /** Checks whether two horizontal frame borders are "connectable". Two borders are "connectable" in terms of this function, if both can be @@ -541,7 +537,6 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( ); - /** Draws a vertical frame border, regards all connected frame styles. The frame style to draw is passed as parameter rBorder. The function @@ -612,7 +607,6 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( ); - /** Draws both diagonal frame borders, regards all connected frame styles. One or both passed diagonal frame styles may be invisible. @@ -641,7 +635,6 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( ); - } } diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 5260c0cd4213..c87073857965 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -376,7 +376,6 @@ public: void DrawArray( OutputDevice& rDev, const Color* pForceColor = nullptr ) const; - private: typedef std::unique_ptr<ArrayImpl> ArrayImplPtr; diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 567d21ec1472..36eef98be745 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -30,7 +30,6 @@ class SvxFrameDirectionItem; namespace svx { - /** This listbox contains entries to select horizontal text direction. The control works on the SvxFrameDirection enumeration (i.e. left-to-right, @@ -64,7 +63,6 @@ private: typedef FrameDirectionListBox FrameDirListBox; - /** Wrapper for usage of a FrameDirectionListBox in item connections. */ class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection > { @@ -85,7 +83,6 @@ typedef sfx::ValueItemWrapper< SvxFrameDirectionItem, SvxFrameDirection, sal_uIn typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper > FrameDirListBoxConnection; - } #endif diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 312693e53259..5ab775fb47dc 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -37,7 +37,6 @@ namespace svx { struct FrameSelectorImpl; - typedef int FrameSelFlags; const FrameSelFlags FRAMESEL_NONE = 0x0000; @@ -69,7 +68,6 @@ const FrameSelFlags FRAMESEL_DIAGONAL = FRAMESEL_DIAG_TLBR|FRAMESEL_DIAG_BLTR; const FrameSelFlags FRAMESEL_DONTCARE = 0x0100; - /** All possible states of a frame border. */ enum FrameBorderState { @@ -79,7 +77,6 @@ enum FrameBorderState }; - class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameSelector : public Control { public: @@ -191,7 +188,6 @@ private: }; - } #endif diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx index fa3b2b193c48..b9af1f24288f 100644 --- a/include/svx/helperhittest3d.hxx +++ b/include/svx/helperhittest3d.hxx @@ -39,7 +39,6 @@ class E3dCompoundObject; class E3dScene; - /** support for getting a ViewInformation3D for a given CompoudObject3D with correct ObjectTransformation filled out @@ -96,7 +95,6 @@ bool checkHitSingle3DObject( const E3dCompoundObject& rCandidate); - #endif // INCLUDED_SVX_HELPERHITTEST3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx index 61aafef39e07..fe7cebae0710 100644 --- a/include/svx/ifaceids.hxx +++ b/include/svx/ifaceids.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_IFACEIDS_HXX - #include <sfx2/shell.hxx> #define SVX_INTERFACE_BASIDE_DOCSH (SFX_INTERFACE_IDE_START+ 0) diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index 75a2f24bfb7c..0dd05213cbaf 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -29,7 +29,6 @@ class ToolBox; class SvxPopupWindowListBox; - class SvxListBoxControl : public SfxToolBoxControl { protected: @@ -52,7 +51,6 @@ public: }; - class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { std::vector< OUString > aUndoRedoList; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 39d87f6bdd72..54cd7d664225 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -73,7 +73,6 @@ public: }; - // class SvxLineEndWindow class SvxLineEndWindow : public SfxPopupWindow @@ -143,7 +142,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index cbc76bc3eee8..626f7ebf0dc9 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -26,7 +26,6 @@ // class SvxNumberInfoItem ----------------------------------------------- - /* This item is used as a transport medium for a number formatter */ @@ -80,7 +79,6 @@ private: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index 5b625f91dd32..6376a9cbcbbe 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -44,7 +44,6 @@ public: }; - #endif // INCLUDED_SVX_OBJFAC3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 5d9e188c3a8e..80d252f148d2 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -33,7 +33,6 @@ namespace svx { class DialControl; - struct OrientationHelper_Impl; /** A helper class that manages a DialControl and a "Stacked text" check box. @@ -91,7 +90,6 @@ private: }; - /** Wrapper for usage of the stacked attribute of an OrientationHelper in item connections. */ class SVX_DLLPUBLIC OrientStackedWrapper : public sfx::SingleControlWrapper< OrientationHelper, bool > { @@ -106,12 +104,10 @@ public: }; - /** An item<->control connection for the stacked attribute of an OrientationHelper. */ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > OrientStackedConnection; - } // namespace #endif diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 988c0398e767..388d49b9e139 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -103,7 +103,6 @@ public: }; - /*-------------------------------------------------------------------- container for header/footer attributes --------------------------------------------------------------------*/ @@ -127,8 +126,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index edcf0c0d0f7c..8d929c9aba50 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -25,7 +25,6 @@ // class SvxPostItAuthorItem --------------------------------------------- - /* The author shorthand symbol of a note */ @@ -56,7 +55,6 @@ public: // class SvxPostItDateItem ----------------------------------------------- - /* The date of a note */ @@ -87,7 +85,6 @@ public: // class SvxPostItTextItem ----------------------------------------------- - /* The text of a note */ @@ -116,7 +113,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index d0920f85bfe9..84be72803f55 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrAngleItem class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index d9dfc83e16c2..394611e482d0 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrAngleItem // For all metrics. GetPresentation returns for example for // Value=2500 a "25mm". diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 426bb5245a2b..317f88deb0fb 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrOnOffItem // here GetValueTextByVal() returns "an" or "aus" instead // of "TRUE" or "FALSE" diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 1a66630e4ddc..c0d071c036bf 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrPercentItem // Integer percents of 0 diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index 11f86d37001d..5665b02d3eec 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -27,7 +27,6 @@ #include <svx/sdr/animation/animationstate.hxx> - namespace sdr { namespace animation @@ -43,7 +42,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 703a8fb03d70..1738ca5d1576 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -142,7 +142,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx index 466b95ee37db..20150dc66011 100644 --- a/include/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -80,7 +79,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index 2cdc7c0a7103..077a3455e7c4 100644 --- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace drawinglayer { namespace attribute @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index a1b074487569..039228e007bf 100644 --- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> - namespace drawinglayer { namespace attribute @@ -61,7 +60,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx index 4e208cdd385b..e9841662f90f 100644 --- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx @@ -25,7 +25,6 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> - namespace drawinglayer { namespace attribute @@ -58,7 +57,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx index 1d8aebc06d6c..01aa02aef141 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrtextattribute.hxx @@ -43,7 +43,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -125,7 +124,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 23190a450f40..7a00f143a392 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -101,7 +101,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index 5eaa57c9d6ce..e5fd0ed8c6da 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -203,7 +203,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 8a2d4da131ae..f584f6787833 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -115,7 +115,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 783bc3301c03..f11c188ca789 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -144,7 +144,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 33d6c037693c..9c31755a3e09 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -93,7 +93,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index b8d995bc52ab..6087546b7faa 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -55,7 +55,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 3ecf81ed7441..902a55f29bf0 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -70,7 +70,6 @@ protected: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index ddf54b437477..6936760b8feb 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -129,7 +129,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 28eb5d7cdd36..dccd52ca2b5c 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -48,7 +48,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index af77c3a4ca40..eea4d4892fe9 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -24,7 +24,6 @@ #include <vcl/bitmapex.hxx> - namespace sdr { namespace overlay @@ -90,7 +89,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index e98bd4953220..f8cc7ef8dcee 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -24,7 +24,6 @@ #include <vcl/bitmapex.hxx> - namespace sdr { namespace overlay @@ -70,7 +69,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 08e41ca85343..c5ef0e67cf0b 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -25,7 +25,6 @@ #include <vector> - namespace sdr { namespace overlay @@ -55,7 +54,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index 459b9ab1ce82..4fdba83ae798 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -25,12 +25,10 @@ #include <svx/svxdllapi.h> - #define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L) #define DEFAULT_VALUE_FOR_HITTEST_TWIP (30L) - class Point; namespace sdr @@ -70,7 +68,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 998b805dcb85..a59cfe0b2a98 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -25,7 +25,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> - namespace sdr { namespace overlay @@ -54,7 +53,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 2c63a1f6e77a..101e6a0c0352 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace sdr { namespace overlay @@ -51,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index cdd3448e10ed..ed4d75a51637 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -24,7 +24,6 @@ #include <vcl/region.hxx> - namespace sdr { namespace overlay @@ -80,7 +79,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index 2bf74f5cdbe4..15e489b8e5ab 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -50,7 +50,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive2d @@ -128,7 +127,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 8edabccdd18f..3811f32234ad 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -41,7 +41,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace primitive2d @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index 1161f2c8c194..5123b811a0e3 100644 --- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - #define PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 0) #define PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 1) #define PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 2) @@ -51,7 +50,6 @@ #define PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 24) - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index ccc3b84d5e25..0c70cdfce961 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - namespace sdr { namespace properties diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index 63e0dec21b1b..2943c42a22c9 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -62,7 +62,6 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( bool bTextOnly); - #endif // INCLUDED_SVX_SDRHITTESTHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx index c08678cc4c95..bb200991a298 100644 --- a/include/svx/sdrobjectfilter.hxx +++ b/include/svx/sdrobjectfilter.hxx @@ -29,7 +29,6 @@ namespace svx { - //= SdrObjectFilter /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index ff3bb995bfa8..2196eed121f0 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrYesNoItem // GetValueTextByVal() returns "yes" or "no" // instead of "TRUE" and "FALSE" diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx index 11b9eae1dfbe..4ed901a48a12 100644 --- a/include/svx/shapeproperty.hxx +++ b/include/svx/shapeproperty.hxx @@ -25,7 +25,6 @@ namespace svx { - //= ShapeProperty enum ShapeProperty diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index b673f5304674..dd8a6488c6de 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -38,7 +38,6 @@ namespace svx { - //= IPropertyValueProvider /** a provider for a property value diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index dd77d1eb3b1a..408e35c04bd5 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -48,7 +48,6 @@ public: }; - class SVX_DLLPUBLIC SdrDragEntryPolyPolygon : public SdrDragEntry { private: @@ -62,7 +61,6 @@ public: }; - class SdrDragEntrySdrObject : public SdrDragEntry { private: @@ -85,7 +83,6 @@ public: }; - class SdrDragEntryPrimitive2DSequence : public SdrDragEntry { private: @@ -101,7 +98,6 @@ public: }; - class SdrDragEntryPointGlueDrag : public SdrDragEntry { private: @@ -116,7 +112,6 @@ public: }; - class SVX_DLLPUBLIC SdrDragMethod { private: diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 63b91527ef87..bf6676f82f1f 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -240,7 +240,6 @@ public: sal_uInt16 GetSelectionLevel() const; - // Object-MacroModus (e.g. rect as button or sth. like that): // Persistent. Default TRUE. SvDraw evaluates the flag e.g. at SdrView::GetPreferredPointer(). diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 1184d02168fc..157bb0f9de19 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -28,7 +28,6 @@ #include <vcl/outdev.hxx> - /** * Get ExchangeFormatID of the DrawingEngine. * The data can then be made available via @@ -109,7 +108,6 @@ class SfxItemSet; SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); - /** * Search an ItemSet for Outliner/EditEngine Items * @@ -253,7 +251,6 @@ class SdrObjEditView; SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); - #endif // INCLUDED_SVX_SVDETC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 2db77761b3ed..d73ed7ee9af2 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -148,8 +148,6 @@ public: }; - - #endif // INCLUDED_SVX_SVDGLUE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 3b9fcf454240..b9df48548676 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -82,7 +82,6 @@ enum SdrHdlKind }; - enum BitmapColorIndex { LightGreen, @@ -94,7 +93,6 @@ enum BitmapColorIndex }; - enum BitmapMarkerKind { Rect_7x7, @@ -130,7 +128,6 @@ enum BitmapMarkerKind }; - class SVX_DLLPUBLIC SdrHdl { friend class SdrMarkView; // for the access to nObjHdlNum @@ -241,7 +238,6 @@ public: }; - #define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13) #define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17) @@ -283,7 +279,6 @@ public: }; - class SdrHdlGradient : public SdrHdl { private: @@ -332,7 +327,6 @@ public: }; - // Spiegelachse class SdrHdlLine: public SdrHdl { @@ -368,7 +362,6 @@ public: }; - class E3dVolumeMarker : public SdrHdl { basegfx::B2DPolyPolygon aWireframePoly; @@ -381,7 +374,6 @@ public: }; - class ImpEdgeHdl: public SdrHdl { SdrEdgeLineCode eLineCode; @@ -400,7 +392,6 @@ public: }; - class ImpMeasureHdl: public SdrHdl { // create marker for this kind @@ -414,7 +405,6 @@ public: }; - class ImpTextframeHdl: public SdrHdl { const Rectangle maRect; @@ -427,9 +417,6 @@ public: }; - - - class SVX_DLLPUBLIC SdrHdlList { protected: @@ -488,7 +475,6 @@ public: }; - class SVX_DLLPUBLIC SdrCropHdl : public SdrHdl { private: @@ -514,7 +500,6 @@ protected: }; - class SVX_DLLPUBLIC SdrCropViewHdl : public SdrHdl { private: @@ -540,7 +525,6 @@ protected: }; - #endif // INCLUDED_SVX_SVDHDL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 024124d464c0..e00cbb92a23c 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -90,7 +90,6 @@ public: }; - #endif // INCLUDED_SVX_SVDHLPLN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 1759527d942e..901591038765 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -141,7 +141,6 @@ public: }; - // Flag for cleaning up after the loading of the pools, meaning the // recalculate the RefCounts and dispose unused items) // sal_False == active @@ -621,8 +620,6 @@ public: }; - - #endif // INCLUDED_SVX_SVDMODEL_HXX /* diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index df25580e01d2..39da95499ef0 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -262,7 +262,6 @@ public: const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } - // mechanism to complete disable handles at the view. Handles will be hidden and deleted // when set, no new ones created, no interaction allowed. Handles will be recreated and shown // when reset. Default is false. @@ -452,7 +451,6 @@ public: }; - // - Hit tolarances: // It has to be declared in logical coordinates. So please translate the // wanted pixel value with PixelToLogic in Logical values. @@ -468,7 +466,6 @@ public: // In opposite, a hit in the surrounding sensitive area enables Dragging. - #endif // INCLUDED_SVX_SVDMRKV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index c2b86d842da3..543e67b3e698 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -76,7 +76,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOATTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 2cbe7445271a..24d9e0b953ca 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -153,7 +153,6 @@ public: }; - #endif //_SVDOCAPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index fa3ba75e4110..3b1ca61ad0bb 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -61,7 +61,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index a10447d4922d..322c5a8c3627 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -28,7 +28,6 @@ #include <svx/svxdllapi.h> - class SvStream; class SfxStyleSheet; @@ -58,7 +57,6 @@ enum TableHitKind }; - struct CellPos { sal_Int32 mnCol; @@ -302,7 +300,6 @@ private: }; - } } #endif diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 5b9abe59418d..1b5d081a2152 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -559,8 +559,6 @@ public: void onChainingEvent(); - - // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear @@ -637,7 +635,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 4043fe6dd109..6c88b8469df1 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -555,7 +555,6 @@ public: }; - #endif // INCLUDED_SVX_SVDPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 868570765d6d..f8ea42c696ab 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -34,7 +34,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace vcl { class Region; } class SdrObjList; class SdrObject; @@ -60,7 +59,6 @@ class SdrPageWindow; typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; - class SVX_DLLPUBLIC SdrPageView { private: @@ -268,7 +266,6 @@ public: }; - #endif // INCLUDED_SVX_SVDPAGV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 7821126a3443..06396966e4f0 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -79,7 +79,6 @@ typedef unsigned char SDR_TRISTATE; #define SDRVIEWWIN_NOTFOUND (0xFFFF) - class SdrPaintView; namespace sdr @@ -91,8 +90,6 @@ namespace sdr } - - class SVX_DLLPUBLIC SvxViewHint : public SfxHint { public: @@ -119,7 +116,6 @@ BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx( const sal_uInt32 nMaximumQuadraticPixels = 500000); - class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { friend class SdrPageView; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index ae1ff5d31d4a..1a5c8da77037 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -28,7 +28,6 @@ class XLineAttrSetItem; class XFillAttrSetItem; - class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { public: diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 35c8bb8d851d..b2f6ce112b3d 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -25,7 +25,6 @@ #include <tools/weakbase.hxx> - class OutlinerParaObject; class SdrOutliner; class SdrTextObj; diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 1534f5b3984b..074def139a07 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -324,7 +324,6 @@ public: }; - #endif // INCLUDED_SVX_SVDTRANS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 966e40849450..26cb62a2f118 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -712,7 +712,6 @@ public: }; - /** * The SdrUndoFactory can be set and retrieved from the SdrModel. * It is used by the drawing layer implementations to create undo actions. diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index a2990b7593b1..76cbac8b97a0 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -27,7 +27,6 @@ namespace svx { - //= ToolboxAccess class SVX_DLLPUBLIC ToolboxAccess diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index d356f889bb30..ed807b52c51f 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -34,7 +34,6 @@ namespace svx { - //= ToolboxButtonColorUpdater /** helper class to update a color in a toolbox button image diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index fde0c81fe0d0..2c288aeae31a 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -25,7 +25,6 @@ #include <tools/resary.hxx> - // class SvxTextEncodingTable diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 7324bdd129a9..de0c0a57a901 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item { bool mbBookMode; @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 457a213d4511..89ff80132568 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -39,8 +39,6 @@ namespace svx { - - //= OXFormsDescriptor @@ -85,7 +83,6 @@ namespace svx }; - } diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 24a7d72270b7..ca23d3f7736f 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -25,7 +25,6 @@ #include <svx/svxdllapi.h> - class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { css::uno::Sequence < sal_Int32 > maValues; @@ -54,7 +53,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index ad7ee08bea82..4acfd46b055d 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -33,7 +33,6 @@ namespace toolkit { - //= AnimatedImagesPeer struct AnimatedImagesPeer_Data; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index f5d65de55874..b6a556b6a2e7 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -46,7 +46,6 @@ class AccessibleStateSetHelper; } - // class VCLXAccessibleComponent typedef ::cppu::ImplHelper1< diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 9e5391f0a874..fdbbf3a1fe7e 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -29,7 +29,6 @@ #include <vcl/bitmapex.hxx> - // class VCLXBitmap @@ -73,8 +72,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index 7cafa4ac9764..2ba61b179674 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -30,7 +30,6 @@ #include <toolkit/awt/vclxwindow.hxx> - // class VCLXContainer @@ -69,8 +68,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 4d54ec521c59..e216f2df4468 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -108,8 +108,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index c65684682bff..85b00d1cad4d 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -83,7 +83,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 18c41f89ad30..145d3bc7f99f 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -69,8 +69,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 727baebd0c75..6225b258a18f 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -82,7 +82,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index d7114a175b2c..6d932925075f 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -30,7 +30,6 @@ namespace toolkit { - //= VCLXSpinButton typedef ::cppu::ImplHelper1 < css::awt::XSpinValue diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 29840ffb5458..684136cf5f5e 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -53,8 +53,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 1c0b6af7fb9b..5a65a949b11a 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -106,8 +106,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index de95b539a122..f065f4788070 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -108,7 +108,6 @@ class VclMenuEvent; // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model - class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow { private: @@ -401,8 +400,6 @@ public: }; - - // class VCLXDialog class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 286be0861491..e7ab21bc16fd 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -34,7 +34,6 @@ namespace toolkit { - //= OAccessibleControlContext diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index bbf694baed73..f6ef3585ea45 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -31,7 +31,6 @@ namespace toolkit { - // = UnoControlFormattedFieldModel class UnoControlFormattedFieldModel : public UnoControlModel diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index e858e0722b04..549e7e12cbdc 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -50,7 +50,6 @@ namespace com { namespace sun { namespace star { // { - //= OGeometryControlModel_Base typedef ::cppu::WeakAggComponentImplHelper2 < css::util::XCloneable diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 5efc1f354c75..e7eedd0096bc 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -53,7 +53,6 @@ namespace toolkit > UnoControlRoadmapModel_IBase; - typedef UnoControlBase UnoControlRoadmap_Base; typedef ::cppu::ImplHelper4 < css::awt::XItemEventBroadcaster , css::container::XContainerListener @@ -62,13 +61,10 @@ namespace toolkit > UnoControlRoadmap_IBase; - - typedef ::cppu::ImplHelper2< css::container::XContainerListener, css::awt::XItemEventBroadcaster> SVTXRoadmap_Base; - // = UnoControlRoadmapModel class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, @@ -147,7 +143,6 @@ namespace toolkit }; - // = UnoRoadmapControl class UnoRoadmapControl : public UnoControlRoadmap_Base, @@ -194,8 +189,6 @@ namespace toolkit } // toolkit - - #endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 540ef9ca76b1..d915fc723941 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -88,7 +88,6 @@ public: }; - #endif // _TOOLKIT_AWT_STDTABCONTROLLER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index bcace97f0ce3..92d54dbc4386 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -139,7 +139,6 @@ public: }; - #endif // _TOOLKIT_HELPER_STDTABCONTROLLERMODEL_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index cfd29157dd22..7e1f3c6b0cba 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -32,7 +32,6 @@ namespace toolkit { - //= UnoControlScrollBarModel class UnoControlScrollBarModel : public UnoControlModel @@ -116,8 +115,6 @@ namespace toolkit }; - - } // namespacetoolkit diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index a410c722add8..ba9519e5a940 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -230,8 +230,6 @@ private: }; - - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index aa15a3e2cdec..9021c97186cf 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -62,7 +62,6 @@ protected: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index b08430984fd9..2c220b01c88e 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -158,7 +158,6 @@ private: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index cc7fcbc84d64..46ee1cab2ecc 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -26,7 +26,6 @@ #include <toolkit/helper/servicenames.hxx> - // class css::awt::UnoControlContainerModel class UnoControlContainerModel : public UnoControlModel @@ -56,7 +55,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 220c32aa933d..c81ba5268627 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -1095,7 +1095,6 @@ public: }; - // class UnoControlDateFieldModel class UnoControlDateFieldModel : public UnoControlModel @@ -1556,7 +1555,6 @@ public: }; - // class UnoControlFixedLineModel class UnoControlFixedLineModel : public UnoControlModel @@ -1605,7 +1603,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index 96d5ab54a426..9dc25084cf7c 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -42,8 +42,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index d1a1e6a11e07..ef1acc37759d 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -74,7 +74,6 @@ public: }; - // class EventListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, css::lang::XEventListener ) @@ -89,7 +88,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, css::awt::XFocu DECL_LISTENERMULTIPLEXER_END - // class WindowListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWindowListener ) @@ -100,8 +98,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWin DECL_LISTENERMULTIPLEXER_END - - // class VclContainerListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, css::awt::XVclContainerListener ) diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 20e7c7cbf30a..a3a0e04a8173 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -70,7 +70,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti cppu::UnoType<css::lang::XTypeProvider>::get(), - #define IMPL_XTYPEPROVIDER_END \ ); \ pCollection = &collection; \ @@ -80,7 +79,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti } - #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -92,7 +90,6 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -104,12 +101,10 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_END \ }; - #define IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ClassName, InterfaceName ) \ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ @@ -129,7 +124,6 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti } - #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 949d644d9558..a43504c0a103 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -37,8 +37,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index 114795b880f7..d3a637dc46d4 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -243,8 +243,6 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ); bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ); - - #endif // INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 4ea4dc79acaa..cf8383f0ccbb 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -621,7 +621,6 @@ inline void Rectangle::expand(long nExpandBy) } - template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const Rectangle& rectangle ) diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index af6bae2ea8b9..4516c3bab2e6 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -27,7 +27,6 @@ namespace ucbhelper { - /** * This class implements the interface css::io::XActiveDataStreamer. * Instances of this class can be passed with the parameters of an diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 7715470d58c1..e31a95d2af04 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -61,7 +61,6 @@ namespace ucbhelper { - /** * These are the possible values for the parameter eMode of method * ucbhelper::Content::createCursor. @@ -86,7 +85,6 @@ enum InsertOperation }; - class Content_Impl; /** diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 91cf9934ae94..58dbc00feb45 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -58,7 +58,6 @@ namespace ucbhelper { - class ContentProviderImplHelper; /** diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 702febc060ee..25969f17ae4e 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -33,7 +33,6 @@ namespace ucbhelper struct ContentIdentifier_Impl; - /** * This class implements a simple identifier object for UCB contents. * It mainly stores and returns the URL as it was passed to the constructor - diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index 929a9202c849..acf778e1c8af 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -32,11 +32,9 @@ namespace ucbhelper { - // class PropertySetInfo. - class ContentImplHelper; /** @@ -100,11 +98,9 @@ public: }; - // class CommandProcessorInfo. - /** * This class provides a command info ( the complete implementation of * the interface XCommandInfo ) for an object derived from class diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 4a4ead773d79..483be3405336 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -31,14 +31,12 @@ #include <ucbhelper/getcomponentcontext.hxx> - #define CPPU_TYPE( T ) cppu::UnoType<T>::get() #define CPPU_TYPE_REF( T ) CPPU_TYPE( T ) // XTypeProvider impl. internals - #define XTYPEPROVIDER_COMMON_IMPL( Class ) \ css::uno::Sequence< sal_Int8 > SAL_CALL \ Class::getImplementationId() \ @@ -69,11 +67,9 @@ Class::getTypes() \ } - // XTypeProvider impl. - // 2 interfaces supported #define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \ XTYPEPROVIDER_COMMON_IMPL( Class ) \ @@ -163,7 +159,6 @@ GETTYPES_IMPL_END // XServiceInfo impl. internals - #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ throw( css::uno::RuntimeException, std::exception ) \ @@ -211,11 +206,9 @@ Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFacto } - // XServiceInfo impl. - #define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ css::uno::Reference< css::lang::XSingleServiceFactory > \ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ) \ diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 691936286df6..8781a7d81725 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -44,7 +44,6 @@ namespace ucbhelper { class PropertyValues; - /** * This class implements the interface XRow. After construction of a valueset * the user can append properties ( incl. its values ) to the set. This class diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index 385338b14197..ab0dca5a73d7 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -34,7 +34,6 @@ #include <ucbhelper/ucbhelperdllapi.h> - namespace com { namespace sun { namespace star { namespace ucb { class XPropertySetRegistry; class XPersistentPropertySet; @@ -45,7 +44,6 @@ namespace ucbhelper_impl { struct ContentProviderImplHelper_Impl; } namespace ucbhelper { - class ContentImplHelper; typedef rtl::Reference< ContentImplHelper > ContentImplHelperRef; typedef std::list< ContentImplHelperRef > ContentRefList; diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 63dec4212149..4f002deb9620 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -42,11 +42,9 @@ namespace ucbhelper { - #define RESULTSET_SERVICE_NAME "com.sun.star.ucb.ContentResultSet" - class ResultSetDataSupplier; struct ResultSet_Impl; @@ -414,7 +412,6 @@ public: }; - /** * This is the base class for an object that supplies data to a result set * diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index e43a2e6857be..f34b8666768c 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -38,11 +38,9 @@ namespace cppu { namespace ucbhelper { - #define DYNAMICRESULTSET_SERVICE_NAME "com.sun.star.ucb.DynamicResultSet" - /** * This is an abstract base class for implementations of the service * com.sun.star.ucb.DynamicResultSet, which is the result of the command diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index cda709eb045e..9ac6996f4a97 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -44,7 +44,6 @@ namespace ucbhelper { - /** * This is a structure that holds additional meta data for one column * of a resultset. The default values set in the constructor should be a @@ -129,7 +128,6 @@ ResultSetColumnData::ResultSetColumnData() } - /** * This is an implementation of the interface XResultSetMetaData. It can be * used to implement the interface diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 5adcb042a466..fd792082dde3 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -34,11 +34,9 @@ #include <vector> - typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumerationHelper_BASE; - /** A wrapper that holds a com.sun.star.container.XIndexAccess and provides a com.sun.star.container.XEnumeration. @@ -72,7 +70,6 @@ private: }; - /** A wrapper that holds a com.sun.star.container.XEnumeration or a com.sun.star.container.XIndexAccess and provides an enumeration of VBA objects. @@ -110,7 +107,6 @@ protected: }; - // deprecated, use SimpleEnumerationBase instead! class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE { @@ -128,7 +124,6 @@ public: // only requirement is the object needs to implement XName - typedef ::cppu::WeakImplHelper< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE; template< typename OneIfc > diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index dd2cfba96461..6bfb8fd8bb83 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { } } } - typedef ::cppu::WeakImplHelper< css::script::vba::XVBAEventProcessor, css::document::XEventListener, @@ -107,7 +106,6 @@ protected: const css::uno::Any& rUserData = css::uno::Any() ); - struct EventQueueEntry { sal_Int32 mnEventId; @@ -184,7 +182,6 @@ private: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 21e718594b9d..1ec99155e270 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -108,7 +108,6 @@ public: }; - /** Helper macro to implement the method 'getServiceImplName()' of the 'ooo.vba.XHelperInterface' interface. Will return the class name as service implementation name. @@ -120,7 +119,6 @@ OUString classname::getServiceImplName() \ } - /** Helper macro to implement the method 'getServiceNames()' for a single service name. */ @@ -137,7 +135,6 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ } - /** Helper macro to declare the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface in a class declaration. @@ -147,7 +144,6 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ virtual css::uno::Sequence< OUString > getServiceNames() override; - /** Helper macro to implement the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface. Will return the class name as service implementation name. @@ -157,7 +153,6 @@ VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \ VBAHELPER_IMPL_GETSERVICENAMES( classname, servicename ) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index b370b025a152..da6d09111a61 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -416,7 +416,6 @@ inline T* VclBuilder::get(const OString& sID) } - //helper baseclass to ease retro fitting dialogs/tabpages that load a resource //to load a .ui file instead // diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index edf0e04f7deb..8bc10969ecfe 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -68,7 +68,6 @@ VCL_DLLPUBLIC sal_uInt64 SAL_CALL vcl_crc64 ( ) SAL_THROW_EXTERN_C(); - VCL_DLLPUBLIC const sal_uInt64* vcl_get_crc64_table(); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 803f2f5e0ef7..dede22f9d680 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -31,8 +31,6 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; } class StyleSettings; - - class VCL_DLLPUBLIC Control : public vcl::Window { protected: diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index e11cdeb22fad..a615951b5094 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -25,8 +25,6 @@ #include <vcl/salctype.hxx> - - struct ConvertData; class Graphic; diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index 4c1daa3aab1b..757fb0d450d0 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -56,7 +56,6 @@ bool VCL_DLLPUBLIC ReadDIBV5( SvStream& rIStm); - bool VCL_DLLPUBLIC WriteDIB( // WriteDIB(rBitmap, rOStm, false, true); const Bitmap& rSource, SvStream& rOStm, @@ -72,5 +71,4 @@ sal_uInt32 getDIBV5HeaderSize(); #endif // INCLUDED_VCL_DIBTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 3f8f2f6acdf7..7da7263ef868 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -209,8 +209,6 @@ public: }; - - class VCL_DLLPUBLIC DockingWindow : public vcl::Window , public VclBuilderContainer @@ -347,7 +345,6 @@ public: }; - inline void DockingWindow::RollDown() { if ( mpFloatWin ) diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 119027cf0fdc..da551edfeb66 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -81,8 +81,6 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode, } - - enum class MouseEventModifiers { NONE = 0, @@ -111,8 +109,6 @@ namespace o3tl #define MOUSE_RIGHT ((sal_uInt16)0x0004) - - class VCL_DLLPUBLIC MouseEvent { private: @@ -242,7 +238,6 @@ public: }; - enum class HelpEventMode { NONE = 0x0000, @@ -338,8 +333,6 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR } - - class VCL_DLLPUBLIC TrackingEvent { private: @@ -374,7 +367,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, } - enum class MouseNotifyEvent { NONE = 0, @@ -440,8 +432,6 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const } - - enum class DataChangedEventType { NONE = 0, SETTINGS = 1, diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 0741efdf2d37..641a3abeabe2 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -35,8 +35,6 @@ class LocaleDataWrapper; class LanguageTag; - - class VCL_DLLPUBLIC FormatterBase { private: @@ -89,9 +87,6 @@ public: }; - - - #define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) class VCL_DLLPUBLIC PatternFormatter : public FormatterBase @@ -128,8 +123,6 @@ public: }; - - class VCL_DLLPUBLIC NumericFormatter : public FormatterBase { private: @@ -206,8 +199,6 @@ public: }; - - class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter { private: @@ -262,9 +253,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter { private: @@ -287,9 +275,6 @@ public: }; - - - class VCL_DLLPUBLIC DateFormatter : public FormatterBase { private: @@ -340,7 +325,6 @@ public: const Date& GetMax() const { return maMax; } - // MT: Remove these methods too, ExtDateFormat should be enough! // What should happen if using DDMMYYYY, but ShowCentury=false? @@ -380,9 +364,6 @@ public: }; - - - class VCL_DLLPUBLIC TimeFormatter : public FormatterBase { private: @@ -457,9 +438,6 @@ public: }; - - - class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: @@ -472,9 +450,6 @@ public: }; - - - class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter { protected: @@ -501,9 +476,6 @@ public: }; - - - class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter { protected: @@ -571,9 +543,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { public: @@ -593,9 +562,6 @@ public: }; - - - class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter { private: @@ -627,8 +593,6 @@ public: }; - - class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter { private: @@ -662,9 +626,6 @@ public: }; - - - class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: @@ -680,9 +641,6 @@ public: }; - - - class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: @@ -703,9 +661,6 @@ public: }; - - - class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: @@ -736,9 +691,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: @@ -757,8 +709,6 @@ public: }; - - class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: @@ -775,9 +725,6 @@ public: }; - - - class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 85188d288821..cfbddb5fbad2 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -30,8 +30,6 @@ class UserDrawEvent; - - class VCL_DLLPUBLIC FixedText : public Control { private: @@ -91,8 +89,6 @@ public: }; - - class VCL_DLLPUBLIC FixedLine : public Control { private: @@ -152,8 +148,6 @@ public: }; - - class VCL_DLLPUBLIC FixedImage : public Control { private: diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 01672f0b7650..2e9aa42f3fd0 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -28,8 +28,6 @@ class ToolBox; - - enum class FloatWinPopupFlags { NONE = 0x000000, diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index ea31f0dd5bb3..592c70714bfd 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -40,7 +40,6 @@ void VCL_DLLPUBLIC clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource); - #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 15461dcc2031..5c4b8acd1df4 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -40,8 +40,6 @@ namespace tools { class Gradient; - - #define GDI_METAFILE_END ((size_t)0xFFFFFFFF) #define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF) @@ -53,8 +51,6 @@ enum MtfConversion }; - - typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index f31824dfb8cd..3e1c8cbf9f17 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -29,8 +29,6 @@ class SvStream; - - struct ImpBuffer { sal_uLong mnRefCount; @@ -48,8 +46,6 @@ struct ImpBuffer }; - - struct ImpSwap { OUString maURL; @@ -67,8 +63,6 @@ struct ImpSwap }; - - struct ImpGfxLink { MapMode maPrefMapMode; @@ -87,8 +81,6 @@ struct ImpGfxLink //#endif // __PRIVATE - - enum GfxLinkType { GFX_LINK_TYPE_NONE = 0, @@ -111,8 +103,6 @@ enum GfxLinkType #define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP - - struct ImpBuffer; struct ImpSwap; struct ImpGfxLink; diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 5c44fc5486d6..b80c79f75c43 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -28,8 +28,6 @@ #include <o3tl/cow_wrapper.hxx> - - class Rectangle; class Point; class SvStream; @@ -59,8 +57,6 @@ public: }; - - class VCL_DLLPUBLIC Gradient { private: diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index bd83af4bb493..a090c557aa7c 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -130,7 +130,6 @@ enum class GraphicFileFormat }; - class VCL_DLLPUBLIC GraphicDescriptor { SvStream* pFileStm; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 0ba7e3ad77bd..3c44b8c1ca9d 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -25,8 +25,6 @@ #include <vcl/ctrl.hxx> - - class VCL_DLLPUBLIC GroupBox : public Control { private: diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 0dd3e8c3601d..0518b290bba3 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -26,8 +26,6 @@ #include <vcl/vclenum.hxx> - - class SvStream; struct ImplHatch @@ -46,8 +44,6 @@ struct ImplHatch }; - - class VCL_DLLPUBLIC Hatch { private: diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index 1970c21dd99a..2c0ec962b459 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -30,7 +30,6 @@ class Rectangle; namespace vcl { class Window; } - enum class QuickHelpFlags { NONE = 0x0000, diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx index f24c49a633b4..c7cbbefe1cd5 100644 --- a/include/vcl/imagerepository.hxx +++ b/include/vcl/imagerepository.hxx @@ -30,7 +30,6 @@ namespace vcl { - //= ImageRepository // provides access to the application's image repository (image.zip) diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 582b73274fdb..656bc8321c06 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -26,8 +26,6 @@ #include <vcl/bitmapex.hxx> - - class VCL_DLLPUBLIC ImageControl : public FixedImage { private: diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index ced1d2903bc3..49f0c8f260b3 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -26,8 +26,6 @@ #include <o3tl/typed_flags_set.hxx> - - enum class InputContextFlags { NONE = 0x0000, @@ -42,8 +40,6 @@ namespace o3tl } - - class VCL_DLLPUBLIC InputContext { private: diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 3495bb28dd33..82a7e8cc28c1 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/drawing/LineCap.hpp> - - class SvStream; namespace basegfx { class B2DPolyPolygon; } @@ -56,8 +54,6 @@ struct ImplLineInfo }; - - class VCL_DLLPUBLIC LineInfo { private: diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index d159d9255b67..8b40478d904b 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -27,8 +27,6 @@ class LocaleDataWrapper; - - class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase { private: @@ -72,8 +70,6 @@ public: }; - - class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter { friend void ImplNewLongCurrencyFieldValue(LongCurrencyField*, const BigInt&); @@ -104,8 +100,6 @@ public: }; - - class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { public: diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 1fef4f749864..508bdd82c8e5 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -29,8 +29,6 @@ class SvStream; class OutputDevice; - - class VCL_DLLPUBLIC MapMode { friend class OutputDevice; diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 3e47a87df4fd..9822db32b458 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -26,8 +26,6 @@ #include <vcl/dllapi.h> - - // Mnemonic Chars, which we want support // Latin 0-9 #define MNEMONIC_RANGE_1_START 0x30 @@ -51,8 +49,6 @@ #define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) - - class VCL_DLLPUBLIC MnemonicGenerator { private: diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx index acecf5e62a6c..1574704158ed 100644 --- a/include/vcl/mnemonicengine.hxx +++ b/include/vcl/mnemonicengine.hxx @@ -35,7 +35,6 @@ namespace vcl { - //= IMnemonicEntryList /// callback for a MnemonicEngine diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 5e96c3a9eb5a..3da26df19225 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -28,8 +28,6 @@ struct ImplMoreButtonData; - - class VCL_DLLPUBLIC MoreButton : public PushButton { private: diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 37165181fbb7..dbbed2dff45c 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -53,7 +53,6 @@ struct VCL_DLLPUBLIC PPDValue }; - /* * PPDKey - a container for the available options (=values) of a PPD keyword */ @@ -112,7 +111,6 @@ struct PPDKeyhash }; - /* * PPDParser - parses a PPD file and contains all available keys from it */ @@ -241,7 +239,6 @@ public: }; - /* * PPDContext - a class to manage user definable states based on the * contents of a PPDParser. diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 884e8076edc7..85b1e24d5b53 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -46,13 +46,9 @@ ************************************************************************/ - - #define WB_STDPROGRESSBAR WB_BORDER - - class VCL_DLLPUBLIC ProgressBar : public vcl::Window { private: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 376fad492278..84fef6fde74e 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -50,7 +50,6 @@ namespace vcl { } - enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN, @@ -72,7 +71,6 @@ public: }; - class VCL_DLLPUBLIC QueueInfo { friend class Printer; @@ -106,7 +104,6 @@ enum PrinterTransparencyMode }; - enum PrinterGradientMode { PRINTER_GRADIENT_STRIPES = 0, @@ -114,7 +111,6 @@ enum PrinterGradientMode }; - enum PrinterBitmapMode { PRINTER_BITMAP_OPTIMAL = 0, @@ -123,7 +119,6 @@ enum PrinterBitmapMode }; - class VCL_DLLPUBLIC PrinterOptions { private: diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 2d5d9b969e10..06cf3f800196 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -25,17 +25,12 @@ #include <o3tl/typed_flags_set.hxx> - - enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE }; - - enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; - enum class PrintQueueFlags { NONE = 0x00000000, @@ -73,7 +68,6 @@ namespace o3tl #define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) - enum class PrinterCapType { SupportDialog = 1, diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 63664484a413..2940dda12779 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -29,12 +29,10 @@ #include <vcl/dllapi.h> - typedef sal_uInt8* Scanline; typedef const sal_uInt8* ConstScanline; - #define BMP_FORMAT_BOTTOM_UP 0x00000000UL #define BMP_FORMAT_TOP_DOWN 0x80000000UL @@ -64,7 +62,6 @@ typedef const sal_uInt8* ConstScanline; #define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) - #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ const sal_uInt8 _def_cR = static_cast<sal_uInt8>( d_RS < 0 ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ const sal_uInt8 _def_cG = static_cast<sal_uInt8>( d_GS < 0 ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ @@ -74,7 +71,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO (sal_uInt8) ( _def_cB | ( ( _def_cB & maB.mnOr ) >> maB.mnOrShift ) ) ); - #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_ALPHA ) \ ( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ @@ -407,9 +403,6 @@ inline sal_uInt8 BitmapColor::GetLuminance() const } - - - inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); @@ -422,7 +415,6 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn } - inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index e9864609280c..b4fa3e79c326 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -27,13 +27,10 @@ class AutoTimer; - - enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN, SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET }; - struct ImplScrollBarData; class VCL_DLLPUBLIC ScrollBar : public Control @@ -139,8 +136,6 @@ public: }; - - class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window { private: diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 7576c61dfba5..2f3ee27f0ce7 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -37,8 +37,6 @@ class CommandEvent; enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION }; - - class VCL_DLLPUBLIC FunctionSet { public: @@ -61,7 +59,6 @@ public: }; - enum class SelectionEngineFlags { DRG_ENAB = 0x0001, IN_SEL = 0x0002, diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index aa6f4d51e77f..932bb9c2de08 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -175,9 +175,6 @@ struct FrameStyle }; - - - enum class StyleSettingsOptions { NONE = 0x0000, @@ -624,8 +621,6 @@ public: }; - - class VCL_DLLPUBLIC MiscSettings { void CopyData(); @@ -651,7 +646,6 @@ public: }; - class VCL_DLLPUBLIC HelpSettings { void CopyData(); @@ -671,7 +665,6 @@ public: }; - enum class AllSettingsFlags { NONE = 0x0000, MOUSE = 0x0001, diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index d99b4ff9a431..868365efbae0 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -25,8 +25,6 @@ namespace vcl { class Window; } - - class VCL_DLLPUBLIC Sound { public: diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 68392f0f15fb..d381fd1cf33d 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -26,8 +26,6 @@ #include <vcl/timer.hxx> - - class VCL_DLLPUBLIC SpinButton : public Control { private: diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 23339b164dc6..057cccbbc709 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -29,20 +29,15 @@ struct ImplStatusItem; typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; - void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize); - - typedef sal_uInt16 StatusBarItemBits; - - #define SIB_LEFT ((StatusBarItemBits)0x0001) #define SIB_CENTER ((StatusBarItemBits)0x0002) #define SIB_RIGHT ((StatusBarItemBits)0x0004) @@ -53,15 +48,11 @@ typedef sal_uInt16 StatusBarItemBits; #define SIB_USERDRAW ((StatusBarItemBits)0x0080) - - #define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) #define STATUSBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define STATUSBAR_OFFSET ((long)5) - - class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 58771f29da92..81de7439a617 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -43,8 +43,6 @@ class VclContainer; #define ICON_MACROLIBRARY 1 - - #define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001) #define WINDOWSTATE_MASK_Y ((sal_uInt32)0x00000002) #define WINDOWSTATE_MASK_WIDTH ((sal_uInt32)0x00000004) @@ -119,8 +117,6 @@ public: }; - - enum class MenuBarMode { Normal, Hide diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 734607a450b5..b1c16e0d5560 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -26,8 +26,6 @@ #include <vcl/window.hxx> - - class VCL_DLLPUBLIC TabPage : public vcl::Window , public VclBuilderContainer diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 43a6adc9a65d..ee6862ced477 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -59,7 +59,6 @@ public: }; - class VCL_DLLPUBLIC TextAttribFontColor : public TextAttrib { private: diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 060c068ead4e..c9a6d0b76164 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -121,8 +121,6 @@ namespace o3tl } - - // Type fuer GetWindow() enum class GetWindowType { @@ -429,8 +427,6 @@ enum class GetDlgWindowType }; - - #ifdef DBG_UTIL const char* ImplDbgCheckWindow( const void* pObj ); #endif diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 507de99dddbe..0fb812c8fde6 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -29,8 +29,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} struct SystemParentData; - - // Presentation Flags enum class PresentationFlags { @@ -46,8 +44,6 @@ namespace o3tl } - - class VCL_DLLPUBLIC WorkWindow : public SystemWindow { private: diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx index 59f04df2abd9..702bb1a6c268 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/include/xmloff/PageMasterStyleMap.hxx @@ -25,7 +25,6 @@ #include <xmloff/contextid.hxx> - #define XML_PM_TYPE_PAGESTYLELAYOUT (XML_PM_TYPES_START + 0) #define XML_PM_TYPE_NUMFORMAT (XML_PM_TYPES_START + 1) #define XML_PM_TYPE_NUMLETTERSYNC (XML_PM_TYPES_START + 2) diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 79f4d1dc05af..068cc351130c 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -54,7 +54,6 @@ class SvXMLImportContext; class SvXMLImport; - /** With this class you can import a <chart:chart> element containing its data as <table:table> element or without internal table. In the latter case you have to provide a table address mapper that diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index b8a0da555c66..d3aec1c7e230 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -28,7 +28,6 @@ struct SvXMLEnumMapEntry; - /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index d52f1bf50ec4..27aa216092f9 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -42,7 +42,6 @@ class XMLPropertySetMapper; class SvXMLExportPropertyMapper; - struct XMLPageExportNameEntry { OUString sPageMasterName; @@ -50,7 +49,6 @@ struct XMLPageExportNameEntry }; - class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject { SvXMLExport& rExport; diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index 346553a0a057..e5052a1aea01 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -29,7 +29,6 @@ namespace xmloff { - //= XMLExporter class SAL_NO_VTABLE XMLSettingsExportContext diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 8b4ea5cba459..26bdb2e3838c 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -40,7 +40,6 @@ namespace xmloff { - //= OFormLayerXMLImport class OFormLayerXMLImport_Impl; diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index 212b771ecfe2..8a292008183e 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -25,7 +25,6 @@ #include <unotools/saveopt.hxx> - /** Represents a property with its API-name, its XML-name and the type of its value. */ @@ -99,7 +98,6 @@ struct XMLPropertyMapEntry }; - /** Smart struct to transport an Any with an index to the appropriate property-name */ diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index bad4b367b04f..85465db76d23 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -46,7 +46,6 @@ class XMLPropertySetMapper; class SvXMLImportPropertyMapper; - enum SdXMLGroupShapeElemTokenMap { XML_TOK_GROUP_GROUP, @@ -199,7 +198,6 @@ public: }; - class SdXML3DSceneAttributesHelper { protected: @@ -243,7 +241,6 @@ public: }; - class SvXMLShapeContext : public SvXMLImportContext { protected: @@ -262,7 +259,6 @@ public: }; - class ShapeSortContext; struct XMLShapeImportHelperImpl; struct XMLShapeImportPageContextImpl; diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 7878e27c2a46..de1908f2d8bc 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -122,7 +122,6 @@ public: getPropertySetMapper() const; - /** implementation helper for FillPropertySet: fill an XPropertySet. * Exceptions will be asserted. */ static bool _FillPropertySet( diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx index c8d88b273fb2..391f8a67a6a4 100644 --- a/include/xmloff/xmlmultiimagehelper.hxx +++ b/include/xmloff/xmlmultiimagehelper.hxx @@ -24,7 +24,6 @@ #include <xmloff/xmlimp.hxx> - class MultiImageImportHelper { private: @@ -55,7 +54,6 @@ public: }; - #endif // INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 3ece1bc82400..0f9d19a02331 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -118,7 +118,6 @@ public: void SetWasUsed(const css::uno::Sequence<sal_Int32>& rWasUsed); - // two methods to allow the field import/export to treat system languages // properly: diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index c2c9d8e5aabb..bc46a978a859 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -31,7 +31,6 @@ class SvXMLUnitConverter; struct XMLPropertyState; - /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ |