diff options
42 files changed, 0 insertions, 186 deletions
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 85ca0a34a43c..42664db8c426 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -34,15 +34,12 @@ class AccessibleRelationSetHelperImpl; - //= XAccessibleRelationSet helper classes - //... namespace utl ....................................................... namespace utl { - /** @descr This base class provides an implementation of the <code>AccessibleRelationSet</code> service. @@ -145,7 +142,6 @@ private: AccessibleRelationSetHelperImpl* mpHelperImpl; }; - } //... namespace utl ....................................................... #endif diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 2d50da737d1b..330a3e248e54 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -33,15 +33,12 @@ class AccessibleStateSetHelperImpl; - //= XAccessibleStateSet helper classes - //... namespace utl ....................................................... namespace utl { - /** @descr This base class provides an implementation of the <code>AccessibleStateSet</code> service. @@ -153,7 +150,6 @@ private: AccessibleStateSetHelperImpl* mpHelperImpl; }; - } //... namespace utl ....................................................... #endif diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index 7a64584024de..871085199881 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -51,7 +51,6 @@ namespace utl { const OUString& getString( int ) const; }; - class UNOTOOLS_DLLPUBLIC MultiAtomProvider { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index d6b691c357a9..389f13805c45 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { } }}} - class UNOTOOLS_DLLPUBLIC CalendarWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCalendar3 > xC; @@ -52,7 +51,6 @@ public: ); ~CalendarWrapper(); - // wrapper implementations of XCalendar void loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale ); @@ -68,7 +66,6 @@ public: /// convenience method to get local date/time double getLocalDateTime() const; - // wrapper implementations of XCalendar void setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ); @@ -87,12 +84,10 @@ public: fields DST_OFFSET and DST_OFFSET_SECOND_MILLIS into account. */ sal_Int32 getDSTOffsetInMillis() const; - // wrapper implementations of XExtendedCalendar OUString getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) const; - // wrapper implementations of XCalendar3 ::com::sun::star::i18n::Calendar2 getLoadedCalendar() const; @@ -101,7 +96,6 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getGenitiveMonths() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getPartitiveMonths() const; - // convenience methods /// get epoch start (should be 01Jan1970) diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index e5ff17910e6e..4cfcb36e49bd 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -64,7 +64,6 @@ const sal_Int32 nCharClassNumericTypeMask = ::com::sun::star::i18n::KCharacterType::PRINTABLE | ::com::sun::star::i18n::KCharacterType::BASE_FORM; - class UNOTOOLS_DLLPUBLIC CharClass : private boost::noncopyable { LanguageTag maLanguageTag; @@ -89,7 +88,6 @@ public: /// get current Locale const LanguageTag& getLanguageTag() const; - /// isdigit() on ascii values SAL_DEPRECATED("Use rtl::isAsciiDigit instead") static inline bool isAsciiDigit( sal_Unicode c ) @@ -159,7 +157,6 @@ public: nCharClassNumericTypeMask)) == 0); } - // Wrapper implementations of class CharacterClassification OUString uppercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; @@ -202,7 +199,6 @@ public: sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) const; - // Functionality of class International methods bool isAlpha( const OUString& rStr, sal_Int32 nPos ) const; diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx index 1f23c11d396b..9beb0b55361e 100644 --- a/include/unotools/closeveto.hxx +++ b/include/unotools/closeveto.hxx @@ -26,12 +26,9 @@ #include <boost/scoped_ptr.hpp> - namespace utl { - - //= CloseVeto struct CloseVeto_Data; @@ -51,10 +48,8 @@ namespace utl ::boost::scoped_ptr< CloseVeto_Data > m_pData; }; - } // namespace dbaui - #endif // INCLUDED_UNOTOOLS_CLOSEVETO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 1108307644b5..31cab1d2afbf 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -26,10 +26,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/options.hxx> - // types, enums, ... - enum CompatibilityOptions { COPT_USE_PRINTERDEVICE = 0, @@ -65,10 +63,8 @@ enum CompatibilityOptions #define COMPATIBILITY_DEFAULT_NAME OUString( "_default" ) - // forward declarations - /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. @@ -93,13 +89,10 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard constructor and destructor @descr This will initialize an instance with default values. @@ -119,10 +112,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options SvtCompatibilityOptions(); virtual ~SvtCompatibilityOptions(); - // interface - /*-**************************************************************************************************** @short clear complete specified list @descr Call this methods to clear the whole list. @@ -194,10 +185,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options bool IsConsiderWrappingStyle() const; bool IsExpandWordSpace() const; - // private methods - private: /*-**************************************************************************************************** @@ -216,10 +205,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - // private member - private: /*Attention diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index b663a770ffe7..7c586bb326db 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -28,14 +28,11 @@ class ResMgr; - namespace utl { - class OComponentResModuleImpl; - //= OComponentResourceModule /** extends the comphelper::OModule implementation with @@ -62,7 +59,6 @@ namespace utl virtual void onLastClient() SAL_OVERRIDE; }; - //= ModuleRes /** specialized ResId, using the resource manager provided by a given OModule @@ -73,7 +69,6 @@ namespace utl ModuleRes( sal_uInt16 _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { } }; - //= defining a concrete module #define DEFINE_MODULE( ModuleClass, ClientClass, ResClass ) \ @@ -140,7 +135,6 @@ namespace utl } \ }; - //= implementing a concrete module #define IMPLEMENT_MODULE( ModuleClass, resprefix ) \ @@ -171,10 +165,8 @@ namespace utl create( CreateModuleClass(), ::osl::GetGlobalMutex() ); \ } \ - } // namespace utl - #endif // INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 7865bdb3f60c..12965fd31b82 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -27,7 +27,6 @@ #include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> - namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; @@ -82,7 +81,6 @@ namespace utl void CallNotify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - // In special mode ALL_LOCALES we must support reading/writing of localized cfg entries as Sequence< PropertyValue >. // These methods are helper to convert given lists of names and Any-values. // format: PropertyValue.Name = <locale as ISO string> diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 435c27d1cb00..062422175e20 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -33,12 +33,9 @@ namespace comphelper class ComponentContext; } - namespace utl { - - //= OConfigurationNode class OConfigurationTreeRoot; @@ -178,7 +175,6 @@ namespace utl /// invalidate the object virtual void clear() throw(); - // meta information about the node /// checks whether or not the object represents a set node. @@ -211,7 +207,6 @@ namespace utl OUString normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const; }; - //= OConfigurationTreeRoot /** a specialized version of a OConfigurationNode, representing the root @@ -316,10 +311,8 @@ namespace utl virtual void clear() throw() SAL_OVERRIDE; }; - } // namespace utl - #endif // INCLUDED_UNOTOOLS_CONFIGNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx index a4a937e8bc4b..0d460c6fd3ff 100644 --- a/include/unotools/configpaths.hxx +++ b/include/unotools/configpaths.hxx @@ -23,7 +23,6 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - namespace utl { @@ -56,7 +55,6 @@ namespace utl OUString& _rsOutPath, OUString& _rsLocalName); - /** extract the first nodename from a configuration path. @param _sInPath @@ -77,7 +75,6 @@ namespace utl UNOTOOLS_DLLPUBLIC OUString extractFirstFromConfigurationPath( OUString const& _sInPath, OUString* _sOutPath = 0); - /** check whether a path is to a nested node with respect to a parent path. @param _sNestedPath @@ -101,7 +98,6 @@ namespace utl bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); - /** get the relative path to a nested node with respect to a parent path. @param _sNestedPath @@ -126,7 +122,6 @@ namespace utl UNOTOOLS_DLLPUBLIC OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); - /** Create a one-level relative configuration path from a set element name without a known set element type. @@ -141,7 +136,6 @@ namespace utl */ UNOTOOLS_DLLPUBLIC OUString wrapConfigurationElementName(OUString const& _sElementName); - /** Create a one-level relative configuration path from a set element name and a known set element type. @@ -161,10 +155,8 @@ namespace utl OUString wrapConfigurationElementName(OUString const& _sElementName, OUString const& _sTypeName); - } // namespace utl - #endif // INCLUDED_UNOTOOLS_CONFIGPATHS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 14a9dfc7a4e1..8c84678dbc43 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -23,11 +23,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> - namespace utl { - #define CVC_READONLY_ACCESS 0x0000 #define CVC_UPDATE_ACCESS 0x0001 @@ -94,7 +92,6 @@ namespace utl /// dtor ~OConfigurationValueContainer(); - // registering data containers /** registers a data accessor of an arbitrary type. @@ -174,10 +171,8 @@ namespace utl void implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor ); }; - } // namespace utl - #endif // INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index 7611299e38e2..56bdec948f47 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -31,11 +31,9 @@ class Date; class Time; class DateTime; - namespace utl { - namespace starutil = ::com::sun::star::util; UNOTOOLS_DLLPUBLIC void typeConvert(const Date& _rDate, starutil::Date& _rOut); @@ -52,10 +50,8 @@ namespace utl UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const ::rtl::OUString &i_rIn, starutil::Date& o_rDate); UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const ::rtl::OUString &i_rIn, starutil::Time& o_Time); - } // namespace utl - #endif // INCLUDED_UNOTOOLS_DATETIME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx index 4e9872ed2351..d476f81d45f9 100644 --- a/include/unotools/desktopterminationobserver.hxx +++ b/include/unotools/desktopterminationobserver.hxx @@ -21,12 +21,9 @@ #ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX #define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX - namespace utl { - - //= ITerminationListener /** non-UNO version of the com.sun.star.frame::XTerminateListener @@ -41,7 +38,6 @@ namespace utl ~ITerminationListener() {} }; - //= DesktopTerminationObserver /** a class which allows non-UNO components to observe the desktop (aka application) @@ -63,10 +59,8 @@ namespace utl DesktopTerminationObserver(); // never implemented, only static methods }; - } // namespace utl - #endif // INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx index c82dac3ea8e2..ddc28b05279b 100644 --- a/include/unotools/docinfohelper.hxx +++ b/include/unotools/docinfohelper.hxx @@ -34,7 +34,6 @@ public: } // namespace utl - #endif // INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 88d5e29c8d89..2715f015f288 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -22,11 +22,9 @@ #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX #include <com/sun/star/lang/XComponent.hpp> - namespace utl { - struct OEventListenerAdapterImpl; //= OEventListenerAdapter @@ -55,10 +53,8 @@ namespace utl virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) = 0; }; - } // namespace utl - #endif // INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index 8569c64ca2c1..cc42849b2927 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -97,10 +97,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - // private member - private: /*Attention diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index 7a793e64686e..520959763eea 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_UNOTOOLS_FLTRCFG_HXX #define INCLUDED_UNOTOOLS_FLTRCFG_HXX - - #include <unotools/unotoolsdllapi.h> #include <unotools/configitem.hxx> diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 0bae1e42c2b5..6b843a13fde5 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -157,7 +157,6 @@ private: typedef boost::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; - void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, const OUString& rType, std::vector< OUString >& rSubstVector ) const; diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index a8974588b47d..5b8c0c9167cb 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -24,10 +24,8 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> - // - FontToSubsFont - - #define FONTTOSUBSFONT_IMPORT ((sal_uLong)0x00000001) #define FONTTOSUBSFONT_EXPORT ((sal_uLong)0x00000002) #define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS ((sal_uLong)0x00000004) @@ -38,10 +36,8 @@ UNOTOOLS_DLLPUBLIC void DestroyFontToSubsFontConverter( F UNOTOOLS_DLLPUBLIC sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c ); UNOTOOLS_DLLPUBLIC OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter ); - // - StarSymbolToMSMultiFont - - class UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont { public: diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index 8bc32d04c495..ad9a68bfec37 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -30,10 +30,8 @@ namespace utl { struct FontNameAttr; } - // - SubsFontName - - #define SUBSFONT_ONLYONE ((sal_uLong)0x00000001) #define SUBSFONT_MS ((sal_uLong)0x00000002) #define SUBSFONT_PS ((sal_uLong)0x00000004) @@ -45,10 +43,8 @@ UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewT struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const OUString&) const; }; - // - ConvertChar - - class UNOTOOLS_DLLPUBLIC ConvertChar { public: @@ -60,7 +56,6 @@ public: static const ConvertChar* GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName ); }; - // Default-Font #define DEFAULTFONT_SANS_UNICODE ((sal_uInt16)1) #define DEFAULTFONT_SANS ((sal_uInt16)2) diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index a28598c6a35f..903a8a462a0b 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -27,7 +27,6 @@ #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> - /** A wrapper of I18N wrappers. Using this is more expensive than using some single wrapper classes so use it only if you must pass a single pointer @@ -58,7 +57,6 @@ private: void ImplNewLocaleData() const; void ImplNewCollator( bool bCaseSensitive ) const; - public: IntlWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index 16d40fff9451..01dee8153ad3 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -25,7 +25,6 @@ namespace utl { namespace detail { class Options; } } - struct ItemHolderMutexBase { ::osl::Mutex m_aLock; diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 1c5c76f479be..c55f55f5a1fc 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -162,7 +162,6 @@ public: SvtLinguConfig(); virtual ~SvtLinguConfig(); - // borrowed from utl::ConfigItem com::sun::star::uno::Sequence< OUString > diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx index b54b44e2ac45..4ad625eedadf 100644 --- a/include/unotools/linguprops.hxx +++ b/include/unotools/linguprops.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_UNOTOOLS_LINGUPROPS_HXX #define INCLUDED_UNOTOOLS_LINGUPROPS_HXX - // UNO property names for general options #define UPN_IS_GERMAN_PRE_REFORM "IsGermanPreReform" /*! deprecated #i91949 !*/ #define UPN_IS_USE_DICTIONARY_LIST "IsUseDictionaryList" diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 17050d758ae5..15c9520e383a 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -39,20 +39,17 @@ class Date; class Time; class CalendarWrapper; - enum DateFormat { MDY, DMY, YMD }; - enum MeasurementSystem { MEASURE_METRIC, MEASURE_US }; - class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable { static sal_uInt8 nLocaleDataChecking; // 0:=dontknow, 1:=yes, 2:=no @@ -138,7 +135,6 @@ public: /// get current loaded Locale, which might differ from the requested Locale LanguageTag getLoadedLanguageTag() const; - // Wrapper implementations of service LocaleData ::com::sun::star::i18n::LanguageCountryInfo getLanguageCountryInfo() const; @@ -309,7 +305,6 @@ public: inline bool isNumTrailingZeros() const { return true; } - // reserved words const OUString& getTrueWord() const @@ -356,7 +351,6 @@ private: static void evaluateLocaleDataChecking(); }; - #endif // INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index d3f2003914a5..320e93f380c2 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -50,7 +50,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap { public: - /** @short these methods can be used to get the different property names as static const OUString values. @@ -100,7 +99,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap static const OUString& PROP_VIEWONLY(); static const OUString& PROP_DOCUMENTBASEURL(); - // interface public: @@ -113,7 +111,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap MediaDescriptor(); MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); - /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. @@ -131,7 +128,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool addInputStream(); - /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. @@ -150,7 +146,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool addInputStreamOwnLock(); - /** @short it checks if the descriptor describes a readonly stream. @descr The descriptor itself isnt changed doing so. @@ -170,7 +165,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ bool isStreamReadOnly() const; - /** Returns a value from the sequence contained in the property 'ComponentData' of this media descriptor. @@ -185,7 +179,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap ::com::sun::star::uno::Any getComponentDataEntry( const OUString& rName ) const; - /** Inserts a value into the sequence contained in the property 'ComponentData' of the media descriptor. @@ -205,7 +198,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap const OUString& rName, const ::com::sun::star::uno::Any& rValue ); - /** Removes a value from the sequence contained in the property 'ComponentData' of the media descriptor. @@ -265,11 +257,9 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap comphelper::DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0 ); - // helper private: - /** @short tries to open a stream by using the given PostData stream. @descr The stream is used directly ... @@ -293,7 +283,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException); - /** @short tries to open a stream by using the given URL. @descr First it tries to open the content in r/w mode (if its @@ -320,7 +309,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); - /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx index 30c52ef3bdce..eca80c4617aa 100644 --- a/include/unotools/misccfg.hxx +++ b/include/unotools/misccfg.hxx @@ -52,5 +52,4 @@ public: #endif // _MISCCFG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 9dac7166bcc5..0cece61f728e 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -118,22 +118,16 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: void SetFactoryDefaultFilter ( EFactory eFactory , const OUString& sFilter ); - - /** @short return the corresponding application ID for the given document service name. */ static EFactory ClassifyFactoryByServiceName(const OUString& sName); - - /** @short return the corresponding application ID for the given short name. */ static EFactory ClassifyFactoryByShortName(const OUString& sName); - - /** @short return the corresponding application ID for the given properties. @descr Because this search base on filters currently (till we have a better solution) @@ -155,8 +149,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: static EFactory ClassifyFactoryByURL(const OUString& sURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lMediaDescriptor); - - /** @short return the corresponding application ID for the given properties. @descr Here we try to use the list of supported service names of the given model diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx index 32b2555db2a7..bdd0e1030c44 100644 --- a/include/unotools/nativenumberwrapper.hxx +++ b/include/unotools/nativenumberwrapper.hxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { } }}} - class UNOTOOLS_DLLPUBLIC NativeNumberWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier > xNNS; diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx index 31f8a6050a6f..9d5a31100fdf 100644 --- a/include/unotools/numberformatcodewrapper.hxx +++ b/include/unotools/numberformatcodewrapper.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { } }}} - class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC; @@ -47,14 +46,12 @@ public: ~NumberFormatCodeWrapper(); - /// set a new Locale void setLocale( const ::com::sun::star::lang::Locale& rLocale ); /// get current Locale const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; } - // Wrapper implementations of class NumberFormatCodeMapper ::com::sun::star::i18n::NumberFormatCode getFormatCode( sal_Int16 nFormatIndex ) const; diff --git a/include/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx index dd182d1e9a67..01a022c26217 100644 --- a/include/unotools/readwritemutexguard.hxx +++ b/include/unotools/readwritemutexguard.hxx @@ -48,7 +48,6 @@ public: } }; - namespace ReadWriteGuardMode { const sal_Int32 nWrite = 0x01; const sal_Int32 nCriticalChange = 0x02 | nWrite; diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index 0067b7da23ae..40e04dd50bea 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -40,10 +40,8 @@ public: sal_Int32 GetTransliterationFlags() const; - // General Options - bool IsWholeWordsOnly() const; bool IsBackwards() const; bool IsUseRegularExpression() const; @@ -61,10 +59,8 @@ public: void SetMatchCase( bool bVal ); // also Japanese search option void SetNotes( bool bVal); - // Japanese search options - bool IsMatchFullHalfWidthForms() const; bool IsMatchHiraganaKatakana() const; bool IsMatchContractions() const; @@ -106,7 +102,6 @@ public: void SetIgnoreDiacritics_CTL( bool bVal ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index df11b692197b..58e4971acb8e 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -218,10 +218,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool IsConfirmationEnabled() const; void SetConfirmationEnabled( bool bSet ); - // private methods - private: /*-**************************************************************************************************** @@ -240,10 +238,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); - // private member - private: /*Attention diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index f4b3fc7fe056..3b8e164dc8a7 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -35,8 +35,6 @@ namespace com { namespace sun { namespace star { namespace utl { - - //= DisposableComponent /** is a class which controls lifetime of an UNO component via ->XComponent::dispose @@ -71,7 +69,6 @@ namespace utl DisposableComponent& operator=( const DisposableComponent& ); // never implemented }; - //= CloseableComponent class CloseableComponentImpl; @@ -113,7 +110,6 @@ namespace utl CloseableComponent& operator=( const CloseableComponent& ); // never implemented }; - //= SharedUNOComponent /** is a helper class for sharing ownership of a UNO component @@ -236,14 +232,12 @@ namespace utl } }; - template < class INTERFACE, class COMPONENT > INTERFACE* SAL_CALL SharedUNOComponent< INTERFACE, COMPONENT >::operator->() const { return m_xTypedComponent.operator->(); } - // assignments template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::reset( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode ) @@ -252,7 +246,6 @@ namespace utl m_xTypedComponent = _rxComponent; } - // comparison operators template < class INTERFACE, class COMPONENT > bool operator==( const ::com::sun::star::uno::Reference< INTERFACE >& _rLHS, const SharedUNOComponent< INTERFACE, COMPONENT >& _rRHS ) @@ -266,7 +259,6 @@ namespace utl return _rLHS.getTyped() == _rRHS; } - // conversion to Any template < class INTERFACE, class COMPONENT > inline void SAL_CALL operator <<= ( ::com::sun::star::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) @@ -274,49 +266,42 @@ namespace utl rAny <<= value.getTyped(); } - template < class INTERFACE, class COMPONENT > inline ::com::sun::star::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) SAL_THROW(()) { return makeAny( value.getTyped() ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _queryThrow ), TakeOwnership ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _queryThrow ), TakeOwnership ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); } - template < class INTERFACE, class COMPONENT > void SharedUNOComponent< INTERFACE, COMPONENT >::set( const SharedUNOComponent& _rComp, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) { @@ -325,7 +310,6 @@ namespace utl m_xTypedComponent.set( m_xTypedComponent, _setThrow ); } - template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -333,7 +317,6 @@ namespace utl return is(); } - template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -341,7 +324,6 @@ namespace utl return is(); } - template < class INTERFACE, class COMPONENT > bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_Query _query ) { @@ -349,10 +331,8 @@ namespace utl return is(); } - } // namespace utl - #endif // INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index 6cf186070e3e..af2942b957a5 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -72,7 +72,6 @@ public: } // namespace utl - #endif // _UNOTOOLS_STREAM_WRAPPER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/streamsection.hxx b/include/unotools/streamsection.hxx index 4fbfe61edb38..a71b4bf55e87 100644 --- a/include/unotools/streamsection.hxx +++ b/include/unotools/streamsection.hxx @@ -74,5 +74,4 @@ public: #endif // INCLUDED_UNOTOOLS_STREAMSECTION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index e6e536ba5502..c52d09e68e85 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -37,7 +37,6 @@ namespace utl namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; - //= OInputStreamWrapper typedef ::cppu::WeakImplHelper1 < stario::XInputStream @@ -74,7 +73,6 @@ protected: void checkError() const; }; - //= OSeekableInputStreamWrapper typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable @@ -96,7 +94,6 @@ public: virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - //= OOutputStreamWrapper typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamWrapper_Base; @@ -121,7 +118,6 @@ protected: SvStream& rStream; }; - //= OSeekableOutputStreamWrapper typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 574070e0ba52..ea53a358d09e 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -39,11 +39,9 @@ namespace com { } } - namespace utl { - // Utility class for searching class UNOTOOLS_DLLPUBLIC SearchParam { @@ -88,7 +86,6 @@ public: bool IsSrchInSelection() const { return m_bSrchInSel; } bool IsSrchWordOnly() const { return m_bWordOnly; } - void SetSrchStr( const OUString& rStr ) { sSrchStr = rStr; } void SetReplaceStr( const OUString& rStr ) { sReplaceStr = rStr; } void SetSrchType( SearchType eType ) { m_eSrchType = eType; } @@ -173,10 +170,8 @@ public: }; - } // namespace utl - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx index a6ea3218680b..715ea5fceb07 100644 --- a/include/unotools/transliterationwrapper.hxx +++ b/include/unotools/transliterationwrapper.hxx @@ -109,7 +109,6 @@ public: sal_Int32 compareString( const OUString& rStr1, const OUString& rStr2 ) const; - // helpers /** If two strings are really equal as per this translation, and not just diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index c5a4e676057d..dcf044d28ab2 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -29,10 +29,8 @@ #include <rtl/ustring.hxx> #include <unotools/options.hxx> - // forward declarations - class SvtViewOptionsBase_Impl; /*-************************************************************************************************************ @@ -108,13 +106,10 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard constructor and destructor @descr This will de-/initialize an instance with default values. @@ -149,10 +144,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op static void AcquireOptions(); static void ReleaseOptions(); - // interface - /*-**************************************************************************************************** @short use it to get information about existing entries in configuration @descr The methods to set/get the position or size will create a new entry automaticly if @@ -258,10 +251,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op void SetUserItem( const OUString& sName , const ::com::sun::star::uno::Any& aValue ); - // private methods - private: /*-**************************************************************************************************** @@ -280,10 +271,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - // private member - private: /// specify which list of views in configuration is used! This can't be a static value!!! diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index 2e880e35f7fa..54fec55bcd90 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -33,7 +33,6 @@ struct SvtAcceleratorConfigItem #include <list> typedef ::std::list < SvtAcceleratorConfigItem > SvtAcceleratorItemList; - class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler, public ::cppu::OWeakObject { |