diff options
Diffstat (limited to 'unotools/source')
59 files changed, 0 insertions, 1054 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 4c4548fe3e92..a0e306744a2b 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -23,7 +23,6 @@ #include "unotools/bootstrap.hxx" - #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> @@ -35,7 +34,6 @@ #include <osl/process.h> #include "tools/getprocessworkingdir.hxx" - // #define this to true, if remembering defaults is not supported properly #define RTL_BOOTSTRAP_DEFAULTS_BROKEN true @@ -53,18 +51,13 @@ #define BOOTSTRAP_DIRNAME_USERDIR "user" - typedef char const * AsciiString; - namespace utl { - - // Implementation class: Bootstrap::Impl - namespace { OUString makeImplName() @@ -137,15 +130,12 @@ namespace utl theImpl::get().initialize(); } - // helper - typedef Bootstrap::PathStatus PathStatus; sal_Unicode const cURLSeparator = '/'; - // path status utility function static PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirItem) @@ -187,7 +177,6 @@ PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirI return eStatus; } - static bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem) { @@ -238,8 +227,6 @@ bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !! } } - - static bool implMakeAbsoluteURL(OUString & _rsPathOrURL) { @@ -306,8 +293,6 @@ PathStatus checkStatusAndNormalizeURL(OUString & _sURL) return eStatus; } - - // helpers to build and check a nested URL static PathStatus getDerivedPath( @@ -353,11 +338,9 @@ PathStatus getDerivedPath( OSL_ASSERT( aStatus > Bootstrap::PATH_VALID ); } - return aStatus; } - static inline PathStatus getDerivedPath( @@ -370,8 +353,6 @@ PathStatus getDerivedPath( return getDerivedPath(_rURL,_aBaseData.path,_aBaseData.status,_sRelativeURL,_rData,_sBootstrapParameter); } - - static OUString getExecutableBaseName() { @@ -398,8 +379,6 @@ OUString getExecutableBaseName() return sExecutable; } - - static inline Bootstrap::PathStatus updateStatus(Bootstrap::Impl::PathData & _rResult) @@ -407,7 +386,6 @@ Bootstrap::PathStatus updateStatus(Bootstrap::Impl::PathData & _rResult) return _rResult.status = checkStatusAndNormalizeURL(_rResult.path); } - static Bootstrap::PathStatus implGetBootstrapFile(rtl::Bootstrap& _rData, Bootstrap::Impl::PathData & _rBootstrapFile) { @@ -416,7 +394,6 @@ Bootstrap::PathStatus implGetBootstrapFile(rtl::Bootstrap& _rData, Bootstrap::Im return updateStatus(_rBootstrapFile); } - static Bootstrap::PathStatus implGetVersionFile(rtl::Bootstrap& _rData, Bootstrap::Impl::PathData & _rVersionFile) { @@ -433,7 +410,6 @@ static char const IS_MISSING[] = "is missing"; static char const IS_INVALID[] = "is corrupt"; static char const PERIOD[] = ". "; - static void addFileError(OUStringBuffer& _rBuf, OUString const& _aPath, AsciiString _sWhat) { OUString sSimpleFileName = _aPath.copy(1 +_aPath.lastIndexOf(cURLSeparator)); @@ -443,7 +419,6 @@ static void addFileError(OUStringBuffer& _rBuf, OUString const& _aPath, AsciiStr _rBuf.appendAscii(_sWhat).appendAscii(PERIOD); } - static void addMissingDirectoryError(OUStringBuffer& _rBuf, OUString const& _aPath) { _rBuf.appendAscii("The configuration directory"); @@ -451,7 +426,6 @@ static void addMissingDirectoryError(OUStringBuffer& _rBuf, OUString const& _aPa _rBuf.appendAscii(IS_MISSING).appendAscii(PERIOD); } - static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo = NULL) { if (NULL == _sExtraInfo) @@ -460,7 +434,6 @@ static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo = _rBuf.appendAscii(_sExtraInfo).appendAscii(PERIOD); } - static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Impl const& _rData) { Bootstrap::FailureCode eErrCode = Bootstrap::INVALID_BOOTSTRAP_DATA; @@ -557,10 +530,8 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im return eErrCode; } - // class Bootstrap - OUString Bootstrap::getProductKey() { OUString const csProductKeyItem(BOOTSTRAP_ITEM_PRODUCT_KEY); @@ -570,7 +541,6 @@ OUString Bootstrap::getProductKey() return data().getBootstrapValue( csProductKeyItem, sDefaultProductKey ); } - OUString Bootstrap::getProductKey(OUString const& _sDefault) { OUString const csProductKeyItem(BOOTSTRAP_ITEM_PRODUCT_KEY); @@ -578,7 +548,6 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault) return data().getBootstrapValue( csProductKeyItem, _sDefault ); } - OUString Bootstrap::getBuildVersion(OUString const& _sDefault) { OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION); @@ -589,7 +558,6 @@ OUString Bootstrap::getBuildVersion(OUString const& _sDefault) return sBuildVersion; } - OUString Bootstrap::getBuildIdData(OUString const& _sDefault) { OUString const csBuildIdItem(BOOTSTRAP_ITEM_BUILDID); @@ -603,8 +571,6 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault) return sBuildId; } - - Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL) { Impl::PathData const& aPathData = data().aBaseInstall_; @@ -613,7 +579,6 @@ Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL) return aPathData.status; } - PathStatus Bootstrap::locateUserInstallation(OUString& _rURL) { Impl::PathData const& aPathData = data().aUserInstall_; @@ -622,8 +587,6 @@ PathStatus Bootstrap::locateUserInstallation(OUString& _rURL) return aPathData.status; } - - PathStatus Bootstrap::locateUserData(OUString& _rURL) { OUString const csUserDirItem(BOOTSTRAP_ITEM_USERDIR); @@ -641,7 +604,6 @@ PathStatus Bootstrap::locateUserData(OUString& _rURL) } } - PathStatus Bootstrap::locateBootstrapFile(OUString& _rURL) { Impl::PathData const& aPathData = data().aBootstrapINI_; @@ -650,7 +612,6 @@ PathStatus Bootstrap::locateBootstrapFile(OUString& _rURL) return aPathData.status; } - PathStatus Bootstrap::locateVersionFile(OUString& _rURL) { Impl::PathData const& aPathData = data().aVersionINI_; @@ -659,7 +620,6 @@ PathStatus Bootstrap::locateVersionFile(OUString& _rURL) return aPathData.status; } - Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode) { Impl const& aData = data(); @@ -680,10 +640,8 @@ Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage, return result; } - // class Bootstrap::Impl - bool Bootstrap::Impl::initBaseInstallationData(rtl::Bootstrap& _rData) { OUString const csBaseInstallItem( BOOTSTRAP_ITEM_BASEINSTALLATION ); @@ -698,7 +656,6 @@ bool Bootstrap::Impl::initBaseInstallationData(rtl::Bootstrap& _rData) return bResult; } - bool Bootstrap::Impl::initUserInstallationData(rtl::Bootstrap& _rData) { OUString const csUserInstallItem( BOOTSTRAP_ITEM_USERINSTALLATION ); @@ -732,7 +689,6 @@ bool Bootstrap::Impl::initUserInstallationData(rtl::Bootstrap& _rData) return bResult; } - void Bootstrap::Impl::initialize() { rtl::Bootstrap aData( m_aImplName ); @@ -769,7 +725,6 @@ void Bootstrap::Impl::initialize() } } - OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const { rtl::Bootstrap aData( m_aImplName ); @@ -779,7 +734,6 @@ OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString con return sResult; } - bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const { // try to open version.ini (versionrc) @@ -795,7 +749,6 @@ bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, return true; } - } // namespace utl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 4145357ae6f9..242a920d2caa 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -75,7 +75,6 @@ class SvtCmdOptions m_aCommandHashMap.insert( CommandHashMap::value_type( aCmd, 0 ) ); } - // convert internal list to external format // for using it on right menus really // Notice: We build a property list with 4 entries and set it on result list then. @@ -191,7 +190,6 @@ class SvtCommandOptions_Impl : public ConfigItem SvtFrameVector m_lFrames; }; - // constructor SvtCommandOptions_Impl::SvtCommandOptions_Impl() @@ -230,7 +228,6 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() EnableNotification( aNotifySeq, true ); } - // destructor SvtCommandOptions_Impl::~SvtCommandOptions_Impl() @@ -242,7 +239,6 @@ SvtCommandOptions_Impl::~SvtCommandOptions_Impl() } } - // public method void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) @@ -284,7 +280,6 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) } } - // public method void SvtCommandOptions_Impl::Commit() @@ -292,7 +287,6 @@ void SvtCommandOptions_Impl::Commit() OSL_FAIL( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); } - // public method bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const @@ -303,7 +297,6 @@ bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) return false; } - // public method bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const @@ -321,7 +314,6 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co return false; } - // public method void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) @@ -335,7 +327,6 @@ void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno:: m_lFrames.push_back(xWeak); } - // private method Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() @@ -363,7 +354,6 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() return lDisabledItems; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -371,7 +361,6 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() SvtCommandOptions_Impl* SvtCommandOptions::m_pDataContainer = NULL ; sal_Int32 SvtCommandOptions::m_nRefCount = 0 ; - // constructor SvtCommandOptions::SvtCommandOptions() @@ -388,7 +377,6 @@ SvtCommandOptions::SvtCommandOptions() } } - // destructor SvtCommandOptions::~SvtCommandOptions() @@ -406,7 +394,6 @@ SvtCommandOptions::~SvtCommandOptions() } } - // public method bool SvtCommandOptions::HasEntries( CmdOption eOption ) const @@ -415,7 +402,6 @@ bool SvtCommandOptions::HasEntries( CmdOption eOption ) const return m_pDataContainer->HasEntries( eOption ); } - // public method bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const @@ -424,7 +410,6 @@ bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandUR return m_pDataContainer->Lookup( eCmdOption, aCommandURL ); } - // public method void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) @@ -438,7 +423,6 @@ namespace class theCommandOptionsMutex : public rtl::Static<osl::Mutex, theCommandOptionsMutex>{}; } - // private method Mutex& SvtCommandOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 51b27ce54148..46bcaf30e1fe 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -31,10 +31,8 @@ #include <algorithm> - // namespaces - using namespace ::std; using namespace ::utl; using namespace ::rtl; @@ -76,10 +74,8 @@ using namespace ::com::sun::star::beans; #define OFFSET_CONSIDERWRAPPINGSTYLE 11 #define OFFSET_EXPANDWORDSPACE 12 - // private declarations! - /*-**************************************************************************************************************** @descr struct to hold information about one compatibility entry ****************************************************************************************************************-*/ @@ -144,14 +140,12 @@ class SvtCompatibility lEntries.push_back( rEntry ); } - // the only way to free memory! void Clear() { lEntries.clear(); } - // convert internal list to external format Sequence< Sequence< PropertyValue > > GetList() const { @@ -217,22 +211,17 @@ class SvtCompatibilityOptions_Impl : public ConfigItem // public methods - public: - // constructor / destructor - SvtCompatibilityOptions_Impl(); virtual ~SvtCompatibilityOptions_Impl(); void SetDefault( const OUString & sName, bool bValue ); - // overloaded methods of baseclass - /*-**************************************************************************************************** @short called for notify of configmanager @descr These method is called from the ConfigManager before application ends or from the @@ -264,10 +253,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem virtual void Commit() SAL_OVERRIDE; - // public interface - /*-**************************************************************************************************** @short base implementation of public interface for "SvtCompatibilityOptions"! @descr These class is used as static member of "SvtCompatibilityOptions" ... @@ -309,10 +296,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem inline bool IsConsiderWrappingStyle() const { return m_aDefOptions.bConsiderWrappingStyle; } inline bool IsExpandWordSpace() const { return m_aDefOptions.bExpandWordSpace; } - // private methods - private: /*-**************************************************************************************************** @@ -347,17 +332,14 @@ class SvtCompatibilityOptions_Impl : public ConfigItem void impl_ExpandPropertyNames( const Sequence< OUString >& lSource, Sequence< OUString >& lDestination ); - // private member - private: SvtCompatibility m_aOptions; SvtCompatibilityEntry m_aDefOptions; }; - // constructor SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() @@ -414,7 +396,6 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() } } - // destructor SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl() @@ -452,7 +433,6 @@ void SvtCompatibilityOptions_Impl::SetDefault( const OUString & sName, bool bVal m_aDefOptions.SetExpandWordSpace( bValue ); } - // public method void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& ) @@ -460,7 +440,6 @@ void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& ) DBG_ASSERT( false, "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" ); } - // public method void SvtCompatibilityOptions_Impl::Commit() @@ -509,7 +488,6 @@ void SvtCompatibilityOptions_Impl::Commit() } } - // public method void SvtCompatibilityOptions_Impl::Clear() @@ -518,7 +496,6 @@ void SvtCompatibilityOptions_Impl::Clear() SetModified(); } - // public method Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() const @@ -528,10 +505,8 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co return lReturn; } - // public method - void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, const OUString& _sModule, bool _bUsePrtMetrics, @@ -567,7 +542,6 @@ void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, SetModified(); } - // private method Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequence< OUString >& rItems ) @@ -581,7 +555,6 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen return lProperties; } - // private method void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( @@ -637,7 +610,6 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( } } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -645,7 +617,6 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( SvtCompatibilityOptions_Impl* SvtCompatibilityOptions::m_pDataContainer = NULL; sal_Int32 SvtCompatibilityOptions::m_nRefCount = 0; - // constructor SvtCompatibilityOptions::SvtCompatibilityOptions() @@ -662,7 +633,6 @@ SvtCompatibilityOptions::SvtCompatibilityOptions() } } - // destructor SvtCompatibilityOptions::~SvtCompatibilityOptions() @@ -680,7 +650,6 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions() } } - // public method void SvtCompatibilityOptions::Clear() @@ -694,7 +663,6 @@ void SvtCompatibilityOptions::SetDefault( const OUString & sName, bool bValue ) m_pDataContainer->SetDefault( sName, bValue ); } - // public method void SvtCompatibilityOptions::AppendItem( const OUString& sName, @@ -796,7 +764,6 @@ namespace class theCompatibilityOptionsMutex : public rtl::Static<osl::Mutex, theCompatibilityOptionsMutex>{}; } - // private method Mutex& SvtCompatibilityOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 5a7ea5328c0a..9c66c36be329 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -159,7 +159,6 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th } } - void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) throw(RuntimeException, std::exception) { pParent->RemoveChangesListener(); diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index a3c3f5061141..dfd10cb1c031 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/confignode.hxx> #include <unotools/configpaths.hxx> #include <tools/diagnose_ex.h> @@ -36,11 +35,9 @@ #include <rtl/strbuf.hxx> #endif - namespace utl { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; @@ -48,10 +45,8 @@ namespace utl using namespace ::com::sun::star::container; using namespace ::com::sun::star::configuration; - //= OConfigurationNode - OConfigurationNode::OConfigurationNode(const Reference< XInterface >& _rxNode ) :m_bEscapeNames(false) { @@ -82,7 +77,6 @@ namespace utl setEscape(isSetNode()); } - OConfigurationNode::OConfigurationNode(const OConfigurationNode& _rSource) :OEventListenerAdapter() ,m_xHierarchyAccess(_rSource.m_xHierarchyAccess) @@ -97,7 +91,6 @@ namespace utl startComponentListening(xConfigNodeComp); } - const OConfigurationNode& OConfigurationNode::operator=(const OConfigurationNode& _rSource) { stopAllComponentListening(); @@ -116,7 +109,6 @@ namespace utl return *this; } - void OConfigurationNode::_disposing( const EventObject& _rSource ) { Reference< XComponent > xDisposingSource(_rSource.Source, UNO_QUERY); @@ -125,7 +117,6 @@ namespace utl clear(); } - OUString OConfigurationNode::getLocalName() const { OUString sLocalName; @@ -141,7 +132,6 @@ namespace utl return sLocalName; } - OUString OConfigurationNode::getNodePath() const { OUString sNodePath; @@ -157,7 +147,6 @@ namespace utl return sNodePath; } - OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const { OUString sName(_rName); @@ -182,7 +171,6 @@ namespace utl return sName; } - Sequence< OUString > OConfigurationNode::getNodeNames() const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::getNodeNames: object is invalid!"); @@ -206,7 +194,6 @@ namespace utl return aReturn; } - bool OConfigurationNode::removeNode(const OUString& _rName) const throw() { OSL_ENSURE(m_xContainerAccess.is(), "OConfigurationNode::removeNode: object is invalid!"); @@ -287,7 +274,6 @@ namespace utl return OConfigurationNode(); } - OConfigurationNode OConfigurationNode::openNode(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::openNode: object is invalid!"); @@ -332,13 +318,11 @@ namespace utl return OConfigurationNode(); } - void OConfigurationNode::setEscape(bool _bEnable) { m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is(); } - bool OConfigurationNode::isSetNode() const { bool bIsSet = false; @@ -368,7 +352,6 @@ namespace utl return false; } - bool OConfigurationNode::hasByName(const OUString& _rName) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); @@ -384,7 +367,6 @@ namespace utl return false; } - bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw() { bool bResult = false; @@ -440,12 +422,10 @@ namespace utl OSL_FAIL("OConfigurationNode::setNodeValue: could not replace the value: caught a generic Exception!"); } - } return bResult; } - Any OConfigurationNode::getNodeValue(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); @@ -470,7 +450,6 @@ namespace utl return aReturn; } - void OConfigurationNode::clear() throw() { m_xHierarchyAccess.clear(); @@ -479,7 +458,6 @@ namespace utl m_xContainerAccess.clear(); } - //= helper namespace @@ -499,7 +477,6 @@ namespace utl return NULL; } - Reference< XInterface > lcl_createConfigurationRoot( const Reference< XMultiServiceFactory >& i_rxConfigProvider, const OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite ) { @@ -529,14 +506,12 @@ namespace utl } } - OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference< XInterface >& _rxRootNode ) :OConfigurationNode( _rxRootNode ) ,m_xCommitter( _rxRootNode, UNO_QUERY ) { } - OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference<XComponentContext> & i_rContext, const OUString& i_rNodePath, const bool i_bUpdatable ) :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext ), i_rNodePath, i_bUpdatable, -1, false ).get() ) @@ -549,14 +524,12 @@ namespace utl } } - void OConfigurationTreeRoot::clear() throw() { OConfigurationNode::clear(); m_xCommitter.clear(); } - bool OConfigurationTreeRoot::commit() const throw() { OSL_ENSURE(isValid(), "OConfigurationTreeRoot::commit: object is invalid!"); @@ -578,7 +551,6 @@ namespace utl return false; } - OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite) { Reference< XInterface > xRoot( lcl_createConfigurationRoot( @@ -588,13 +560,11 @@ namespace utl return OConfigurationTreeRoot(); } - OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite ) { return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite ); } - OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext, const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , bool _bLazyWrite ) { @@ -611,8 +581,6 @@ namespace utl return OConfigurationTreeRoot(); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index ebff6c425ce6..fbf7f1567ab6 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -17,20 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/configpaths.hxx" #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> - namespace utl { - - - - static void lcl_resolveCharEntities(OUString & aLocalString) { @@ -73,7 +67,6 @@ void lcl_resolveCharEntities(OUString & aLocalString) aLocalString = aResult.makeStringAndClear(); } - bool splitLastFromConfigurationPath(OUString const& _sInPath, OUString& _rsOutPath, OUString& _rsLocalName) @@ -141,7 +134,6 @@ bool splitLastFromConfigurationPath(OUString const& _sInPath, return nPos >= 0; } - OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _sOutPath) { sal_Int32 nSep = _sInPath.indexOf('/'); @@ -184,8 +176,6 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _ return sResult; } - - // find the position after the prefix in the nested path static inline sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPrefixPath) @@ -215,14 +205,12 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref return bIsPrefix ? nPrefixLength : 0; } - bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath) { return _sPrefixPath.isEmpty() || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0; } - OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath) { @@ -238,7 +226,6 @@ OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, } } - static OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType) { @@ -276,15 +263,11 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType) return aNormalized.makeStringAndClear(); } - - OUString wrapConfigurationElementName(OUString const& _sElementName) { return lcl_wrapName(_sElementName, "*" ); } - - OUString wrapConfigurationElementName(OUString const& _sElementName, OUString const& _sTypeName) { @@ -292,7 +275,6 @@ OUString wrapConfigurationElementName(OUString const& _sElementName, return lcl_wrapName(_sElementName, _sTypeName); } - } // namespace utl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 1697af6ceda8..8f5bf6d81a6f 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -28,15 +28,12 @@ #include <rtl/strbuf.hxx> #endif - namespace utl { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //= NodeValueAccessor enum LocationType @@ -162,10 +159,8 @@ namespace utl } } - //= functors on NodeValueAccessor instances - /// base class for functors syncronizing between exchange locations and config sub nodes struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void > { @@ -207,7 +202,6 @@ namespace utl typedef std::vector<NodeValueAccessor> NodeValueAccessors; - //= OConfigurationValueContainerImpl struct OConfigurationValueContainerImpl @@ -225,10 +219,8 @@ namespace utl } }; - //= OConfigurationValueContainer - OConfigurationValueContainer::OConfigurationValueContainer( const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety, const sal_Char* _pConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) @@ -247,7 +239,6 @@ namespace utl { DBG_ASSERT( !m_pImpl->aConfigRoot.isValid(), "OConfigurationValueContainer::implConstruct: already initialized!" ); - // create the configuration node we're about to work with m_pImpl->aConfigRoot = OConfigurationTreeRoot::createWithComponentContext( m_pImpl->xORB, @@ -344,8 +335,6 @@ namespace utl lcl_copyData( _rAccessor, m_pImpl->aConfigRoot.getNodeValue( _rAccessor.getPath() ), m_pImpl->rMutex ); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 91603499f5d4..6480c6ff6140 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/defaultoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/configitem.hxx> @@ -36,7 +35,6 @@ using namespace osl; using namespace utl; using namespace com::sun::star::uno; - // define ---------------------------------------------------------------- #define DEFAULTPATH__ADDIN 0 @@ -214,8 +212,6 @@ OUString SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const return aRet; } - - SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Path/Default" ) { Sequence< OUString > aNames = GetDefaultPropertyNames(); @@ -324,8 +320,6 @@ SvtDefaultOptions::SvtDefaultOptions() pImp = pOptions; } - - SvtDefaultOptions::~SvtDefaultOptions() { // Global access, must be guarded (multithreading) @@ -338,8 +332,6 @@ SvtDefaultOptions::~SvtDefaultOptions() } } - - OUString SvtDefaultOptions::GetDefaultPath( sal_uInt16 nId ) const { return pImp->GetDefaultPath( nId ); diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 2751f7d186f9..ea3747bd1e64 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/dynamicmenuoptions.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/configmgr.hxx> @@ -331,10 +330,8 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem Sequence< OUString >& lDestination , const OUString& sSetNode ); - // private member - private: SvtDynMenu m_aNewMenu ; @@ -342,7 +339,6 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem SvtDynMenu m_aHelpBookmarksMenu ; }; - // constructor SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() @@ -450,7 +446,6 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() */ } - // destructor SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() @@ -462,7 +457,6 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() } } - // public method void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) @@ -470,7 +464,6 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) DBG_ASSERT( false, "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" ); } - // public method void SvtDynamicMenuOptions_Impl::Commit() @@ -559,7 +552,6 @@ void SvtDynamicMenuOptions_Impl::Commit() */ } - // public method Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDynamicMenuType eMenu ) const @@ -585,7 +577,6 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDyna return lReturn; } - // private method Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount ) @@ -610,7 +601,6 @@ Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt return lProperties; } - // private helper class CountWithPrefixSort @@ -640,7 +630,6 @@ class SelectByPrefix } }; - // private method void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource , @@ -689,7 +678,6 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence } } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -697,7 +685,6 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence SvtDynamicMenuOptions_Impl* SvtDynamicMenuOptions::m_pDataContainer = NULL ; sal_Int32 SvtDynamicMenuOptions::m_nRefCount = 0 ; - // constructor SvtDynamicMenuOptions::SvtDynamicMenuOptions() @@ -714,7 +701,6 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions() } } - // destructor SvtDynamicMenuOptions::~SvtDynamicMenuOptions() @@ -732,7 +718,6 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions() } } - // public method Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMenuType eMenu ) const @@ -746,7 +731,6 @@ namespace class theDynamicMenuOptionsMutex : public rtl::Static<osl::Mutex, theDynamicMenuOptionsMutex>{}; } - // private method Mutex& SvtDynamicMenuOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 09b763a95472..1b9c45521d55 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/eventcfg.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -120,7 +119,6 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl() EnableNotification( aNotifySeq, true ); } - // destructor GlobalEventConfig_Impl::~GlobalEventConfig_Impl() @@ -140,7 +138,6 @@ OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) return OUString(); } - // public method void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) @@ -161,7 +158,6 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) } } - // public method void GlobalEventConfig_Impl::Commit() @@ -191,7 +187,6 @@ void GlobalEventConfig_Impl::Commit() } } - // private method void GlobalEventConfig_Impl::initBindingInfo() @@ -311,7 +306,6 @@ bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException) // and now the wrapper - //initialize static member GlobalEventConfig_Impl* GlobalEventConfig::m_pImpl = NULL ; sal_Int32 GlobalEventConfig::m_nRefCount = 0 ; diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index f56319e2f572..ead33f8ee8b4 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -136,7 +136,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem ExtensionHashMap m_aExtensionHashMap; }; - // constructor SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() @@ -186,7 +185,6 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() EnableNotification( seqNotifyNames ); } - // destructor SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() @@ -198,7 +196,6 @@ SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() } } - // public method void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& ) @@ -206,7 +203,6 @@ void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& ) // Not implemented } - // public method void SvtExtendedSecurityOptions_Impl::Commit() @@ -230,7 +226,6 @@ void SvtExtendedSecurityOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } - // public method SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode() @@ -238,7 +233,6 @@ SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::G return m_eOpenHyperlinkMode; } - // private method void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aHashMap ) @@ -273,7 +267,6 @@ void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aH } } - // private method (currently not used) Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() @@ -289,7 +282,6 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() return seqPropertyNames; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -297,7 +289,6 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL ; sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0 ; - // constructor SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() @@ -315,7 +306,6 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() } } - // destructor SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() @@ -333,7 +323,6 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() } } - // public method SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode() @@ -347,7 +336,6 @@ namespace class theExtendedSecurityOptionsMutex : public rtl::Static<osl::Mutex, theExtendedSecurityOptionsMutex>{}; } - // private method Mutex& SvtExtendedSecurityOptions::GetInitMutex() diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index c86926cb1dfc..dc8dbbdd21e3 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -28,7 +28,6 @@ using namespace utl; using namespace com::sun::star::uno; - #define FILTERCFG_WORD_CODE 0x0001 #define FILTERCFG_WORD_STORAGE 0x0002 #define FILTERCFG_EXCEL_CODE 0x0004 @@ -124,7 +123,6 @@ void SvtAppFilterOptions_Impl::Load() bSaveVBA = *(sal_Bool*)pValues[1].getValue(); } - class SvtWriterFilterOptions_Impl : public SvtAppFilterOptions_Impl { bool bLoadExecutable; @@ -170,7 +168,6 @@ void SvtWriterFilterOptions_Impl::Load() bLoadExecutable = *(sal_Bool*)pValues[0].getValue(); } - class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl { bool bLoadExecutable; @@ -296,8 +293,6 @@ bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const return bRet; } - - SvtFilterOptions::SvtFilterOptions() : ConfigItem( "Office.Common/Filter/Microsoft" ), pImp(new SvtFilterOptions_Impl) @@ -306,7 +301,6 @@ SvtFilterOptions::SvtFilterOptions() : Load(); } - SvtFilterOptions::~SvtFilterOptions() { delete pImp; @@ -409,7 +403,6 @@ void SvtFilterOptions::Load() } } - void SvtFilterOptions::SetLoadWordBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_WORD_CODE, bFlag ); @@ -443,8 +436,6 @@ bool SvtFilterOptions::IsLoadWordBasicStorage() const return pImp->IsFlag( FILTERCFG_WORD_STORAGE ); } - - void SvtFilterOptions::SetLoadExcelBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_EXCEL_CODE, bFlag ); @@ -478,8 +469,6 @@ bool SvtFilterOptions::IsLoadExcelBasicStorage() const return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE ); } - - void SvtFilterOptions::SetLoadPPointBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_PPOINT_CODE, bFlag ); @@ -502,8 +491,6 @@ bool SvtFilterOptions::IsLoadPPointBasicStorage() const return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE ); } - - bool SvtFilterOptions::IsMathType2Math() const { return pImp->IsFlag( FILTERCFG_MATH_LOAD ); @@ -526,8 +513,6 @@ void SvtFilterOptions::SetMath2MathType( bool bFlag ) SetModified(); } - - bool SvtFilterOptions::IsWinWord2Writer() const { return pImp->IsFlag( FILTERCFG_WRITER_LOAD ); @@ -555,7 +540,6 @@ bool SvtFilterOptions::IsUseEnhancedFields() const return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); } - bool SvtFilterOptions::IsExcel2Calc() const { return pImp->IsFlag( FILTERCFG_CALC_LOAD ); @@ -578,8 +562,6 @@ void SvtFilterOptions::SetCalc2Excel( bool bFlag ) SetModified(); } - - bool SvtFilterOptions::IsPowerPoint2Impress() const { return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD ); @@ -642,24 +624,19 @@ SvtFilterOptions& SvtFilterOptions::Get() return theFilterOptions::get(); } - - bool SvtFilterOptions::IsEnablePPTPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_PPT_PREVIEW ); } - bool SvtFilterOptions::IsEnableCalcPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_EXCEL_PREVIEW ); } - bool SvtFilterOptions::IsEnableWordPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_WORD_PREVIEW ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 682721e67bb9..5ff645bc4807 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::configuration; - /* * DefaultFontConfiguration */ @@ -339,8 +338,6 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan return OUString(FALLBACKFONT_UI_SANS); } - - /* * FontSubstConfigItem::get */ @@ -426,7 +423,6 @@ FontSubstConfiguration::~FontSubstConfiguration() * FontSubstConfigItem::getMapName */ - static const char* const aImplKillLeadingList[] = { "microsoft", @@ -450,8 +446,6 @@ static const char* const aImplKillLeadingList[] = NULL }; - - static const char* const aImplKillTrailingList[] = { "microsoft", @@ -502,8 +496,6 @@ static const char* const aImplKillTrailingList[] = NULL }; - - static const char* const aImplKillTrailingWithExceptionsList[] = { "ce", "monospace", "oldface", NULL, @@ -511,8 +503,6 @@ static const char* const aImplKillTrailingWithExceptionsList[] = NULL }; - - struct ImplFontAttrWeightSearchData { const char* mpStr; @@ -539,8 +529,6 @@ static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] = { NULL, WEIGHT_DONTKNOW }, }; - - struct ImplFontAttrWidthSearchData { const char* mpStr; @@ -632,8 +620,6 @@ static ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] = { NULL, 0 }, }; - - static bool ImplKillLeading( OUString& rName, const char* const* ppStr ) { for(; *ppStr; ++ppStr ) @@ -666,8 +652,6 @@ static bool ImplKillLeading( OUString& rName, const char* const* ppStr ) return false; } - - static sal_Int32 ImplIsTrailing( const OUString& rName, const char* pStr ) { sal_Int32 nStrLen = (sal_Int32)strlen( pStr ); @@ -683,8 +667,6 @@ static sal_Int32 ImplIsTrailing( const OUString& rName, const char* pStr ) return nStrLen; } - - static bool ImplKillTrailing( OUString& rName, const char* const* ppStr ) { for(; *ppStr; ++ppStr ) @@ -700,8 +682,6 @@ static bool ImplKillTrailing( OUString& rName, const char* const* ppStr ) return false; } - - static bool ImplKillTrailingWithExceptions( OUString& rName, const char* const* ppStr ) { for(; *ppStr; ++ppStr ) @@ -727,8 +707,6 @@ static bool ImplKillTrailingWithExceptions( OUString& rName, const char* const* return false; } - - static bool ImplFindAndErase( OUString& rName, const char* pStr ) { sal_Int32 nLen = (sal_Int32)strlen(pStr); @@ -742,8 +720,6 @@ static bool ImplFindAndErase( OUString& rName, const char* pStr ) return true; } - - void FontSubstConfiguration::getMapName( const OUString& rOrgName, OUString& rShortName, OUString& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType ) @@ -813,7 +789,6 @@ void FontSubstConfiguration::getMapName( const OUString& rOrgName, OUString& rSh } } - struct StrictStringSort : public ::std::binary_function< const FontNameAttr&, const FontNameAttr&, bool > { bool operator()( const FontNameAttr& rLeft, const FontNameAttr& rRight ) @@ -862,7 +837,6 @@ struct enum_convert int nEnum; }; - static const enum_convert pWeightNames[] = { { "normal", WEIGHT_NORMAL }, diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index dc5e62a9dd40..b7a72446f037 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/fontoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -126,7 +125,6 @@ class SvtFontOptions_Impl : public ConfigItem bool m_bFontWYSIWYG ; }; - // constructor SvtFontOptions_Impl::SvtFontOptions_Impl() @@ -178,7 +176,6 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() EnableNotification( seqNames ); } - // destructor SvtFontOptions_Impl::~SvtFontOptions_Impl() @@ -190,7 +187,6 @@ SvtFontOptions_Impl::~SvtFontOptions_Impl() } } - // public method void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) @@ -227,7 +223,6 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) } } - // public method void SvtFontOptions_Impl::Commit() @@ -258,7 +253,6 @@ void SvtFontOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } - // public method bool SvtFontOptions_Impl::IsFontHistoryEnabled() const @@ -266,7 +260,6 @@ bool SvtFontOptions_Impl::IsFontHistoryEnabled() const return m_bFontHistory; } - // public method void SvtFontOptions_Impl::EnableFontHistory( bool bState ) @@ -275,7 +268,6 @@ void SvtFontOptions_Impl::EnableFontHistory( bool bState ) SetModified(); } - // public method bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const @@ -283,7 +275,6 @@ bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const return m_bFontWYSIWYG; } - // public method void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState ) @@ -292,7 +283,6 @@ void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState ) SetModified(); } - // private method Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() @@ -310,7 +300,6 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() return seqPropertyNames; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -318,7 +307,6 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL ; sal_Int32 SvtFontOptions::m_nRefCount = 0 ; - // constructor SvtFontOptions::SvtFontOptions() @@ -336,7 +324,6 @@ SvtFontOptions::SvtFontOptions() } } - // destructor SvtFontOptions::~SvtFontOptions() @@ -354,7 +341,6 @@ SvtFontOptions::~SvtFontOptions() } } - // public method bool SvtFontOptions::IsFontHistoryEnabled() const @@ -363,7 +349,6 @@ bool SvtFontOptions::IsFontHistoryEnabled() const return m_pDataContainer->IsFontHistoryEnabled(); } - // public method void SvtFontOptions::EnableFontHistory( bool bState ) @@ -372,7 +357,6 @@ void SvtFontOptions::EnableFontHistory( bool bState ) m_pDataContainer->EnableFontHistory( bState ); } - // public method bool SvtFontOptions::IsFontWYSIWYGEnabled() const @@ -381,7 +365,6 @@ bool SvtFontOptions::IsFontWYSIWYGEnabled() const return m_pDataContainer->IsFontWYSIWYGEnabled(); } - // public method void SvtFontOptions::EnableFontWYSIWYG( bool bState ) @@ -395,7 +378,6 @@ namespace class theFontOptionsMutex : public rtl::Static<osl::Mutex, theFontOptionsMutex> {}; } - // private method Mutex& SvtFontOptions::impl_GetOwnStaticMutex() diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 124cee608287..3c41556924d3 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/file.hxx> #include <unotools/historyoptions.hxx> #include <unotools/configmgr.hxx> @@ -69,7 +68,6 @@ namespace { const char s_sThumbnail[] = "Thumbnail"; } - // class SvtHistoryOptions_Impl // redesigned @@ -94,7 +92,6 @@ private: css::uno::Reference< css::container::XNameAccess > m_xCommonXCU; }; - // constructor SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() @@ -124,14 +121,12 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() } } - // destructor SvtHistoryOptions_Impl::~SvtHistoryOptions_Impl() { } - // public method // Attention: We return the max. size of our internal lists - That is the capacity not the size! @@ -172,7 +167,6 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) return nSize; } - void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt32 nSize ) { css::uno::Reference< css::container::XNameAccess > xList; @@ -230,7 +224,6 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt } } - // public method // Clear specified history list @@ -302,7 +295,6 @@ static bool lcl_fileOpenable(const OUString &rURL) return false; } - // public method // get a sequence list from the items @@ -403,7 +395,6 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT return seqReturn; } - // public method // implements a deque in XML @@ -562,7 +553,6 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, } } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -570,7 +560,6 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, SvtHistoryOptions_Impl* SvtHistoryOptions::m_pDataContainer = NULL ; sal_Int32 SvtHistoryOptions::m_nRefCount = 0 ; - // constructor SvtHistoryOptions::SvtHistoryOptions() @@ -588,7 +577,6 @@ SvtHistoryOptions::SvtHistoryOptions() } } - // destructor SvtHistoryOptions::~SvtHistoryOptions() @@ -606,7 +594,6 @@ SvtHistoryOptions::~SvtHistoryOptions() } } - // public method sal_uInt32 SvtHistoryOptions::GetSize( EHistoryType eHistory ) const @@ -615,7 +602,6 @@ sal_uInt32 SvtHistoryOptions::GetSize( EHistoryType eHistory ) const return m_pDataContainer->GetSize( eHistory ); } - // public method void SvtHistoryOptions::Clear( EHistoryType eHistory ) @@ -624,7 +610,6 @@ void SvtHistoryOptions::Clear( EHistoryType eHistory ) m_pDataContainer->Clear( eHistory ); } - // public method Sequence< Sequence< PropertyValue > > SvtHistoryOptions::GetList( EHistoryType eHistory ) const @@ -633,7 +618,6 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions::GetList( EHistoryType e return m_pDataContainer->GetList( eHistory ); } - // public method void SvtHistoryOptions::AppendItem(EHistoryType eHistory, @@ -649,7 +633,6 @@ namespace class theHistoryOptionsMutex : public rtl::Static<osl::Mutex, theHistoryOptionsMutex>{}; } - // private method Mutex& SvtHistoryOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 493df843c3a1..4164d1bb8f5f 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "itemholder1.hxx" #include <comphelper/processfactory.hxx> @@ -49,7 +48,6 @@ #include <unotools/options.hxx> #include <unotools/syslocaleoptions.hxx> - ItemHolder1::ItemHolder1() : ItemHolderMutexBase() { @@ -80,20 +78,17 @@ ItemHolder1::ItemHolder1() #endif } - ItemHolder1::~ItemHolder1() { impl_releaseAllItems(); } - void ItemHolder1::holdConfigItem(EItem eItem) { static ItemHolder1* pHolder = new ItemHolder1(); pHolder->impl_addItem(eItem); } - void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { @@ -101,7 +96,6 @@ void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&) impl_releaseAllItems(); } - void ItemHolder1::impl_addItem(EItem eItem) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -123,7 +117,6 @@ void ItemHolder1::impl_addItem(EItem eItem) m_lItems.push_back(aNewItem); } - void ItemHolder1::impl_releaseAllItems() { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -139,7 +132,6 @@ void ItemHolder1::impl_releaseAllItems() m_lItems.clear(); } - void ItemHolder1::impl_newItem(TItemInfo& rItem) { switch(rItem.eItem) @@ -250,7 +242,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) } } - void ItemHolder1::impl_deleteItem(TItemInfo& rItem) { if (rItem.pItem) diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 7858bbdb8215..f42ba8878dc7 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -33,7 +33,6 @@ class ItemHolder1 : private ItemHolderMutexBase TItems m_lItems; - // c++ interface public: @@ -41,14 +40,12 @@ class ItemHolder1 : private ItemHolderMutexBase virtual ~ItemHolder1(); static void holdConfigItem(EItem eItem); - // uno interface public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: @@ -58,7 +55,6 @@ class ItemHolder1 : private ItemHolderMutexBase void impl_deleteItem(TItemInfo& rItem); }; - // namespaces #undef css diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 924047324616..97d261a2de78 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -161,7 +161,6 @@ public: using utl::ConfigItem::ReplaceSetProperties; //using utl::ConfigItem::GetReadOnlyStates; - com::sun::star::uno::Any GetProperty( const OUString &rPropertyName ) const; com::sun::star::uno::Any @@ -178,7 +177,6 @@ public: bool IsReadOnly( sal_Int32 nPropertyHandle ) const; }; - SvtLinguConfigItem::SvtLinguConfigItem() : utl::ConfigItem( OUString("Office.Linguistic") ) { @@ -190,26 +188,22 @@ SvtLinguConfigItem::SvtLinguConfigItem() : EnableNotification( rPropertyNames ); } - SvtLinguConfigItem::~SvtLinguConfigItem() { //! Commit (SaveOptions) will be called by the d-tor of the base called ! } - void SvtLinguConfigItem::Notify( const uno::Sequence< OUString > &rPropertyNames ) { LoadOptions( rPropertyNames ); NotifyListeners(0); } - void SvtLinguConfigItem::Commit() { SaveOptions( GetPropertyNames() ); } - static struct NamesToHdl { const char *pFullPropName; // full qualified name as used in configuration @@ -258,7 +252,6 @@ static struct NamesToHdl { NULL, NULL, -1} }; - const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames() { uno::Sequence< OUString > aNames; @@ -314,7 +307,6 @@ bool SvtLinguConfigItem::GetHdlByName( } } - uno::Any SvtLinguConfigItem::GetProperty( const OUString &rPropertyName ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -323,7 +315,6 @@ uno::Any SvtLinguConfigItem::GetProperty( const OUString &rPropertyName ) const return GetHdlByName( nHdl, rPropertyName ) ? GetProperty( nHdl ) : uno::Any(); } - uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -406,7 +397,6 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const return aRes; } - bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno::Any &rValue ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -418,7 +408,6 @@ bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno:: return bSucc; } - bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -667,7 +656,6 @@ bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyN return bRes; } - bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyNames ) { if (!IsModified()) @@ -792,8 +780,6 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const return bReadOnly; } - - static SvtLinguConfigItem *pCfgItem = 0; static sal_Int32 nCfgItemRefCount = 0; @@ -968,7 +954,6 @@ static bool lcl_GetFileUrlFromOrigin( return bSuccess; } - bool SvtLinguConfig::GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const @@ -1086,7 +1071,6 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari return aRes; } - uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() const { if (!m_xMainUpdateAccess.is()) @@ -1117,7 +1101,6 @@ uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() cons return m_xMainUpdateAccess; } - OUString SvtLinguConfig::GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const @@ -1153,7 +1136,6 @@ OUString SvtLinguConfig::GetVendorImageUrl_Impl( return aRes; } - OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( const OUString &rServiceImplName ) const @@ -1168,7 +1150,6 @@ OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( return aRes; } - OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( const OUString &rServiceImplName ) const @@ -1217,6 +1198,4 @@ bool SvtLinguConfig::HasGrammarChecker() const return bRes; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index f27941698701..9559010b4710 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/localisationoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -121,7 +120,6 @@ class SvtLocalisationOptions_Impl : public ConfigItem sal_Int32 m_nDialogScale ; }; - // constructor SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() @@ -167,7 +165,6 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() EnableNotification( seqNames ); } - // destructor SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() @@ -179,7 +176,6 @@ SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() } } - // public method void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) @@ -212,7 +208,6 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert NotifyListeners(0); } - // public method void SvtLocalisationOptions_Impl::Commit() @@ -240,7 +235,6 @@ void SvtLocalisationOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } - // public method bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const @@ -248,7 +242,6 @@ bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const return m_bAutoMnemonic; } - // public method sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const @@ -270,7 +263,6 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() return seqPropertyNames; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -278,7 +270,6 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL ; sal_Int32 SvtLocalisationOptions::m_nRefCount = 0 ; - // constructor SvtLocalisationOptions::SvtLocalisationOptions() @@ -296,7 +287,6 @@ SvtLocalisationOptions::SvtLocalisationOptions() } } - // destructor SvtLocalisationOptions::~SvtLocalisationOptions() @@ -314,7 +304,6 @@ SvtLocalisationOptions::~SvtLocalisationOptions() } } - // public method bool SvtLocalisationOptions::IsAutoMnemonic() const @@ -323,7 +312,6 @@ bool SvtLocalisationOptions::IsAutoMnemonic() const return m_pDataContainer->IsAutoMnemonic(); } - // public method sal_Int32 SvtLocalisationOptions::GetDialogScale() const @@ -337,7 +325,6 @@ namespace class theLocalisationOptionsMutex : public rtl::Static<osl::Mutex, theLocalisationOptionsMutex>{}; } - // private method Mutex& SvtLocalisationOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 7fa66b9037b4..8ab0651695e7 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/misccfg.hxx> #include "rtl/instance.hxx" #include <unotools/configmgr.hxx> @@ -30,7 +29,6 @@ using namespace com::sun::star::uno; - namespace utl { diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index a246788903b9..0504c63285fd 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/moduleoptions.hxx> #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> @@ -99,7 +98,6 @@ struct FactoryInfo free(); } - // easy way to reset struct member! void free() { @@ -119,7 +117,6 @@ struct FactoryInfo bDefaultFilterReadonly = false; } - // returns list of properties, which has changed only! // We use given value of sNodeBase to build full qualified paths ... // Last sign of it must be "/". because we use it directly, without any additional things! @@ -184,7 +181,6 @@ struct FactoryInfo return lProperties; } - // We must support setting AND marking of changed values. // That's why we can't make our member public. We must use get/set/init methods // to control access on it! @@ -197,7 +193,6 @@ struct FactoryInfo bool isDefaultFilterReadonly() const { return bDefaultFilterReadonly; } sal_Int32 getIcon () const { return nIcon; }; - // If you call set-methods - we check for changes of valkues and mark it. // But if you wish to set it without that ... you must initialize it! void initInstalled ( bool bNewInstalled ) { bInstalled = bNewInstalled ; } @@ -209,7 +204,6 @@ struct FactoryInfo void setDefaultFilterReadonly( const bool bVal){bDefaultFilterReadonly = bVal;} void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon ; } - void initTemplateFile( const OUString& sNewTemplateFile ) { if ( !sNewTemplateFile.isEmpty() ) @@ -224,7 +218,6 @@ struct FactoryInfo } } - void setTemplateFile( const OUString& sNewTemplateFile ) { if( sTemplateFile != sNewTemplateFile ) @@ -234,7 +227,6 @@ struct FactoryInfo } }; - void setWindowAttributes( const OUString& sNewWindowAttributes ) { if( sWindowAttributes != sNewWindowAttributes ) @@ -244,7 +236,6 @@ struct FactoryInfo } }; - void setDefaultFilter( const OUString& sNewDefaultFilter ) { if( sDefaultFilter != sNewDefaultFilter ) @@ -309,13 +300,11 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem SvtModuleOptions_Impl(); virtual ~SvtModuleOptions_Impl(); - // overloaded methods of baseclass virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE; virtual void Commit( ) SAL_OVERRIDE; - // public interface bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; @@ -334,19 +323,16 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem const OUString& sFilter ); void MakeReadonlyStatesAvailable(); - // private methods private: static css::uno::Sequence< OUString > impl_ExpandSetNames ( const css::uno::Sequence< OUString >& lSetNames ); void impl_Read ( const css::uno::Sequence< OUString >& lSetNames ); - // private types private: - // private member private: @@ -587,7 +573,6 @@ bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule return aRet; } - OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const { OUString sName; @@ -600,7 +585,6 @@ OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFact return sName; } - OUString SvtModuleOptions::GetFactoryShortName(SvtModuleOptions::EFactory eFactory) { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. @@ -639,7 +623,6 @@ OUString SvtModuleOptions::GetFactoryShortName(SvtModuleOptions::EFactory eFacto return sShortName; } - OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const { OUString sFile; @@ -652,7 +635,6 @@ OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EF return sFile; } - OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. @@ -690,7 +672,6 @@ OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EF return sURL; } - OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory ) const { OUString sDefaultFilter; @@ -712,7 +693,6 @@ bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory return bRet; } - sal_Int32 SvtModuleOptions_Impl::GetFactoryIcon( SvtModuleOptions::EFactory eFactory ) const { sal_Int32 nIcon = 0; @@ -725,7 +705,6 @@ sal_Int32 SvtModuleOptions_Impl::GetFactoryIcon( SvtModuleOptions::EFactory eFac return nIcon; } - void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , const OUString& sTemplate ) { @@ -736,7 +715,6 @@ void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions:: } } - void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory, const OUString& sFilter ) { @@ -939,7 +917,6 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa } } - void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() { if (m_bReadOnlyStatesWellKnown) @@ -974,7 +951,6 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() m_bReadOnlyStatesWellKnown = true; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -1007,7 +983,6 @@ SvtModuleOptions::SvtModuleOptions() } } - SvtModuleOptions::~SvtModuleOptions() { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); @@ -1038,28 +1013,24 @@ bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const return m_pDataContainer->IsModuleInstalled( eModule ); } - OUString SvtModuleOptions::GetFactoryName( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryName( eFactory ); } - OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryStandardTemplate( eFactory ); } - OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryEmptyDocumentURL( eFactory ); } - OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); @@ -1079,7 +1050,6 @@ sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const return m_pDataContainer->GetFactoryIcon( eFactory ); } - bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , EFactory& eFactory ) { @@ -1087,7 +1057,6 @@ bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , return SvtModuleOptions_Impl::ClassifyFactoryByName( sName, eFactory ); } - void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFactory , const OUString& sTemplate ) { @@ -1095,7 +1064,6 @@ void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFacto m_pDataContainer->SetFactoryStandardTemplate( eFactory, sTemplate ); } - void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, const OUString& sFilter ) { @@ -1103,49 +1071,42 @@ void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, m_pDataContainer->SetFactoryDefaultFilter( eFactory, sFilter ); } - bool SvtModuleOptions::IsMath() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SMATH ); } - bool SvtModuleOptions::IsChart() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCHART ); } - bool SvtModuleOptions::IsCalc() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCALC ); } - bool SvtModuleOptions::IsDraw() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SDRAW ); } - bool SvtModuleOptions::IsWriter() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SWRITER ); } - bool SvtModuleOptions::IsImpress() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SIMPRESS ); } - bool SvtModuleOptions::IsBasicIDE() const { return true; diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx index 202a2afc69d9..8891cf184c3f 100644 --- a/unotools/source/config/options.cxx +++ b/unotools/source/config/options.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sal/config.h" #include <unotools/options.hxx> @@ -100,5 +99,4 @@ void Options::ConfigurationChanged( ConfigurationBroadcaster*, sal_uInt32 nHint NotifyListeners( nHint ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index b673ef24e988..886c0c2e7953 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/optionsdlg.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -32,7 +31,6 @@ using namespace utl; using namespace com::sun::star::beans ; using namespace com::sun::star::uno; - #define CFG_FILENAME OUString( "Office.OptionsDialog" ) #define ROOT_NODE OUString( "OptionsDialogGroups" ) #define PAGES_NODE OUString( "Pages" ) @@ -80,8 +78,6 @@ namespace return theOptionsDlgOptions_ImplMutex::get(); } - - SvtOptionsDlgOptions_Impl::SvtOptionsDlgOptions_Impl() : ConfigItem( OUString( CFG_FILENAME ) ), @@ -100,15 +96,11 @@ SvtOptionsDlgOptions_Impl::SvtOptionsDlgOptions_Impl() } } - - void SvtOptionsDlgOptions_Impl::Commit() { // nothing to commit } - - void SvtOptionsDlgOptions_Impl::Notify( const Sequence< OUString >& ) { // nothing to notify @@ -168,8 +160,6 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp } } - - OUString getGroupPath( const OUString& _rGroup ) { return OUString( ROOT_NODE + OUString('/') + _rGroup + OUString('/') ); @@ -183,8 +173,6 @@ OUString getOptionPath( const OUString& _rOption ) return OUString( OPTIONS_NODE + OUString('/') + _rOption + OUString('/') ); } - - bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const { bool bRet = false; @@ -194,30 +182,22 @@ bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const return bRet; } - - bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) ); } - - bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) + getPagePath( _rPage ) ); } - - bool SvtOptionsDlgOptions_Impl::IsOptionHidden( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) + getPagePath( _rPage ) + getOptionPath( _rOption ) ); } - - SvtOptionsDialogOptions::SvtOptionsDialogOptions() { // Global access, must be guarded (multithreading) @@ -232,8 +212,6 @@ SvtOptionsDialogOptions::SvtOptionsDialogOptions() m_pImp = pOptions; } - - SvtOptionsDialogOptions::~SvtOptionsDialogOptions() { // Global access, must be guarded (multithreading) diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index f147e61fc6e7..e76bede72052 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace com::sun::star::lang; - #define SEARCHPATH_DELIMITER ';' #define SIGN_STARTVARIABLE OUString( "$(" ) #define SIGN_ENDVARIABLE OUString( ")" ) @@ -91,7 +90,6 @@ class VarNameToEnumMap : public ::boost::unordered_map< OUString, VarNamePropert inline void free() { VarNameToEnumMap().swap( *this ); } }; - // class SvtPathOptions_Impl --------------------------------------------- class SvtPathOptions_Impl { @@ -306,8 +304,6 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString& } } - - OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const { OUString sExpanded( rPath ); @@ -319,15 +315,11 @@ OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const return sExpanded; } - - OUString SvtPathOptions_Impl::UsePathVariables( const OUString& rPath ) const { return m_xSubstVariables->reSubstituteVariables( rPath ); } - - OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const { // Don't work at parameter-string directly. Copy it. @@ -401,8 +393,6 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const return aWorkText; } - - SvtPathOptions_Impl::SvtPathOptions_Impl() : m_aPathArray( (sal_Int32)SvtPathOptions::PATH_COUNT ), m_aLanguageTag( LANGUAGE_DONTKNOW ) @@ -455,8 +445,6 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : m_aLanguageTag.reset( ConfigManager::getLocale() ); } - - // class SvtPathOptions -------------------------------------------------- namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; } @@ -474,8 +462,6 @@ SvtPathOptions::SvtPathOptions() pImp = pOptions; } - - SvtPathOptions::~SvtPathOptions() { // Global access, must be guarded (multithreading) @@ -486,155 +472,111 @@ SvtPathOptions::~SvtPathOptions() } } - - const OUString& SvtPathOptions::GetAddinPath() const { return pImp->GetAddinPath(); } - - const OUString& SvtPathOptions::GetAutoCorrectPath() const { return pImp->GetAutoCorrectPath(); } - - const OUString& SvtPathOptions::GetAutoTextPath() const { return pImp->GetAutoTextPath(); } - - const OUString& SvtPathOptions::GetBackupPath() const { return pImp->GetBackupPath(); } - - const OUString& SvtPathOptions::GetBasicPath() const { return pImp->GetBasicPath(); } - - const OUString& SvtPathOptions::GetBitmapPath() const { return pImp->GetBitmapPath(); } - - const OUString& SvtPathOptions::GetConfigPath() const { return pImp->GetConfigPath(); } - - const OUString& SvtPathOptions::GetDictionaryPath() const { return pImp->GetDictionaryPath(); } - - const OUString& SvtPathOptions::GetFavoritesPath() const { return pImp->GetFavoritesPath(); } - - const OUString& SvtPathOptions::GetFilterPath() const { return pImp->GetFilterPath(); } - - const OUString& SvtPathOptions::GetGalleryPath() const { return pImp->GetGalleryPath(); } - - const OUString& SvtPathOptions::GetGraphicPath() const { return pImp->GetGraphicPath(); } - - const OUString& SvtPathOptions::GetHelpPath() const { return pImp->GetHelpPath(); } - - const OUString& SvtPathOptions::GetLinguisticPath() const { return pImp->GetLinguisticPath(); } - - const OUString& SvtPathOptions::GetFingerprintPath() const { return pImp->GetFingerprintPath(); } - - const OUString& SvtPathOptions::GetModulePath() const { return pImp->GetModulePath(); } - - const OUString& SvtPathOptions::GetPalettePath() const { return pImp->GetPalettePath(); } - - const OUString& SvtPathOptions::GetPluginPath() const { return pImp->GetPluginPath(); } - - const OUString& SvtPathOptions::GetStoragePath() const { return pImp->GetStoragePath(); } - - const OUString& SvtPathOptions::GetTempPath() const { return pImp->GetTempPath(); } - - const OUString& SvtPathOptions::GetTemplatePath() const { return pImp->GetTemplatePath(); } - - const OUString& SvtPathOptions::GetUserConfigPath() const { return pImp->GetUserConfigPath(); @@ -645,190 +587,136 @@ const OUString& SvtPathOptions::GetUIConfigPath() const return pImp->GetUIConfigPath(); } - - const OUString& SvtPathOptions::GetWorkPath() const { return pImp->GetWorkPath(); } - - void SvtPathOptions::SetAddinPath( const OUString& rPath ) { pImp->SetAddinPath( rPath ); } - - void SvtPathOptions::SetAutoCorrectPath( const OUString& rPath ) { pImp->SetAutoCorrectPath( rPath ); } - - void SvtPathOptions::SetAutoTextPath( const OUString& rPath ) { pImp->SetAutoTextPath( rPath ); } - - void SvtPathOptions::SetBackupPath( const OUString& rPath ) { pImp->SetBackupPath( rPath ); } - - void SvtPathOptions::SetBasicPath( const OUString& rPath ) { pImp->SetBasicPath( rPath ); } - - void SvtPathOptions::SetBitmapPath( const OUString& rPath ) { pImp->SetBitmapPath( rPath ); } - - void SvtPathOptions::SetConfigPath( const OUString& rPath ) { pImp->SetConfigPath( rPath ); } - - void SvtPathOptions::SetDictionaryPath( const OUString& rPath ) { pImp->SetDictionaryPath( rPath ); } - - void SvtPathOptions::SetFavoritesPath( const OUString& rPath ) { pImp->SetFavoritesPath( rPath ); } - - void SvtPathOptions::SetFilterPath( const OUString& rPath ) { pImp->SetFilterPath( rPath ); } - - void SvtPathOptions::SetGalleryPath( const OUString& rPath ) { pImp->SetGalleryPath( rPath ); } - - void SvtPathOptions::SetGraphicPath( const OUString& rPath ) { pImp->SetGraphicPath( rPath ); } - - void SvtPathOptions::SetHelpPath( const OUString& rPath ) { pImp->SetHelpPath( rPath ); } - - void SvtPathOptions::SetLinguisticPath( const OUString& rPath ) { pImp->SetLinguisticPath( rPath ); } - - void SvtPathOptions::SetModulePath( const OUString& rPath ) { pImp->SetModulePath( rPath ); } - - void SvtPathOptions::SetPalettePath( const OUString& rPath ) { pImp->SetPalettePath( rPath ); } - - void SvtPathOptions::SetPluginPath( const OUString& rPath ) { pImp->SetPluginPath( rPath ); } - - void SvtPathOptions::SetStoragePath( const OUString& rPath ) { pImp->SetStoragePath( rPath ); } - - void SvtPathOptions::SetTempPath( const OUString& rPath ) { pImp->SetTempPath( rPath ); } - - void SvtPathOptions::SetTemplatePath( const OUString& rPath ) { pImp->SetTemplatePath( rPath ); } - - void SvtPathOptions::SetUserConfigPath( const OUString& rPath ) { pImp->SetUserConfigPath( rPath ); } - - void SvtPathOptions::SetWorkPath( const OUString& rPath ) { pImp->SetWorkPath( rPath ); } - - OUString SvtPathOptions::SubstituteVariable( const OUString& rVar ) const { return pImp->SubstVar( rVar ); } - - OUString SvtPathOptions::ExpandMacros( const OUString& rPath ) const { return pImp->ExpandMacros( rPath ); } - - OUString SvtPathOptions::UseVariable( const OUString& rPath ) const { return pImp->UsePathVariables( rPath ); } - - bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath ) { // check parameter: empty inifile name? @@ -953,8 +841,6 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath ) return bRet; } - - const LanguageTag& SvtPathOptions::GetLanguageTag() const { return pImp->GetLanguageTag(); diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index abe3e5b81356..d66ff822dc85 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/printwarningoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -27,10 +26,8 @@ #include <itemholder1.hxx> - // namespaces - using namespace ::utl ; using namespace ::rtl ; using namespace ::osl ; @@ -56,24 +53,18 @@ class SvtPrintWarningOptions_Impl : public ConfigItem { public: - // constructor / destructor - SvtPrintWarningOptions_Impl(); virtual ~SvtPrintWarningOptions_Impl(); - // overloaded methods of baseclass - virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - // public interface - bool IsPaperSize() const { return m_bPaperSize; } bool IsPaperOrientation() const { return m_bPaperOrientation; } bool IsNotFound() const { return m_bNotFound; } @@ -86,18 +77,14 @@ public: void SetTransparency( bool bState ) { m_bTransparency = bState; SetModified(); } void SetModifyDocumentOnPrintingAllowed( bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); } - // private methods - private: static Sequence< OUString > impl_GetPropertyNames(); - // private member - private: bool m_bPaperSize; @@ -107,7 +94,6 @@ private: bool m_bModifyDocumentOnPrintingAllowed; }; - // constructor SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : @@ -171,7 +157,6 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : } } - // destructor SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() @@ -180,7 +165,6 @@ SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() Commit(); } - // Commit void SvtPrintWarningOptions_Impl::Commit() @@ -220,7 +204,6 @@ void SvtPrintWarningOptions_Impl::Notify( const Sequence< OUString >& ) { } - // private method Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() @@ -241,7 +224,6 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() return seqPropertyNames; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -249,7 +231,6 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() SvtPrintWarningOptions_Impl* SvtPrintWarningOptions::m_pDataContainer = NULL; sal_Int32 SvtPrintWarningOptions::m_nRefCount = 0; - // constructor SvtPrintWarningOptions::SvtPrintWarningOptions() @@ -266,7 +247,6 @@ SvtPrintWarningOptions::SvtPrintWarningOptions() } } - // destructor SvtPrintWarningOptions::~SvtPrintWarningOptions() @@ -284,7 +264,6 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions() } } - // public method bool SvtPrintWarningOptions::IsPaperSize() const @@ -293,7 +272,6 @@ bool SvtPrintWarningOptions::IsPaperSize() const return m_pDataContainer->IsPaperSize(); } - // public method bool SvtPrintWarningOptions::IsPaperOrientation() const @@ -302,7 +280,6 @@ bool SvtPrintWarningOptions::IsPaperOrientation() const return m_pDataContainer->IsPaperOrientation(); } - // public method bool SvtPrintWarningOptions::IsTransparency() const @@ -311,7 +288,6 @@ bool SvtPrintWarningOptions::IsTransparency() const return m_pDataContainer->IsTransparency(); } - // public method void SvtPrintWarningOptions::SetPaperSize( bool bState ) @@ -320,7 +296,6 @@ void SvtPrintWarningOptions::SetPaperSize( bool bState ) m_pDataContainer->SetPaperSize( bState ); } - // public method void SvtPrintWarningOptions::SetPaperOrientation( bool bState ) @@ -329,7 +304,6 @@ void SvtPrintWarningOptions::SetPaperOrientation( bool bState ) m_pDataContainer->SetPaperOrientation( bState ); } - // public method void SvtPrintWarningOptions::SetTransparency( bool bState ) @@ -338,15 +312,12 @@ void SvtPrintWarningOptions::SetTransparency( bool bState ) m_pDataContainer->SetTransparency( bState ); } - bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsModifyDocumentOnPrintingAllowed(); } - - void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -358,7 +329,6 @@ namespace class thePrintWarningOptionsMutex : public rtl::Static<osl::Mutex, thePrintWarningOptionsMutex>{}; } - // private method Mutex& SvtPrintWarningOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index c739dff6b266..b2715c10c7e9 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; - class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; @@ -389,8 +388,6 @@ Sequence< OUString > GetPropertyNames() return aNames; } - - SvtSaveOptions_Impl::SvtSaveOptions_Impl() : ConfigItem( OUString("Office.Common/Save") ) , nAutoSaveTime( 0 ) @@ -745,13 +742,10 @@ void SvtSaveOptions_Impl::Commit() batch->commit(); } - - void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& ) { } - class SvtLoadOptions_Impl : public utl::ConfigItem { @@ -802,7 +796,6 @@ void SvtLoadOptions_Impl::Notify( const Sequence<OUString>& ) SAL_WARN( "unotools.config", "properties have been changed" ); } - namespace { class LocalSingleton : public rtl::Static< osl::Mutex, LocalSingleton > @@ -810,7 +803,6 @@ namespace }; } - SvtSaveOptions::SvtSaveOptions() { // Global access, must be guarded (multithreading) @@ -827,8 +819,6 @@ SvtSaveOptions::SvtSaveOptions() pImp = pOptions; } - - SvtSaveOptions::~SvtSaveOptions() { // Global access, must be guarded (multithreading) diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index c2c3b2a973ac..638708221353 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/searchopt.hxx> #include <tools/debug.hxx> #include <unotools/configitem.hxx> @@ -31,10 +30,8 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; - #define MAX_FLAGS_OFFSET 26 - class SvtSearchOptions_Impl : public ConfigItem { sal_Int32 nFlags; @@ -65,7 +62,6 @@ public: void SetFlag( sal_uInt16 nOffset, bool bVal ); }; - SvtSearchOptions_Impl::SvtSearchOptions_Impl() : ConfigItem( OUString("Office.Common/SearchOptions") ) { @@ -74,13 +70,11 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() : SetModified( false ); } - SvtSearchOptions_Impl::~SvtSearchOptions_Impl() { Commit(); } - void SvtSearchOptions_Impl::Commit() { if (IsModified()) diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index ad4015bbae07..8fe31a372013 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/securityoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> @@ -34,10 +33,8 @@ #include "itemholder1.hxx" - // namespaces - using namespace ::utl ; using namespace ::rtl ; using namespace ::osl ; @@ -73,7 +70,6 @@ using namespace ::com::sun::star::uno ; #define PROPERTYNAME_CONFIRMATIONENABLED "Confirmation" // xmlsec05 deprecated - #define PROPERTYHANDLE_SECUREURL 0 // xmlsec05 deprecated @@ -100,29 +96,22 @@ using namespace ::com::sun::star::uno ; #define CFG_READONLY_DEFAULT false - // private declarations! - class SvtSecurityOptions_Impl : public ConfigItem { // public methods - public: - // constructor / destructor - SvtSecurityOptions_Impl(); virtual ~SvtSecurityOptions_Impl(); - // overloaded methods of baseclass - /*-**************************************************************************************************** @short called for notify of configmanager @descr These method is called from the ConfigManager before application ends or from the @@ -154,10 +143,8 @@ class SvtSecurityOptions_Impl : public ConfigItem virtual void Commit() SAL_OVERRIDE; - // public interface - bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ; Sequence< OUString > GetSecureURLs ( ) const ; @@ -220,7 +207,6 @@ class SvtSecurityOptions_Impl : public ConfigItem bool m_bROTrustedAuthors; bool m_bRODisableMacros; - // xmlsec05 deprecated EBasicSecurityMode m_eBasicMode; bool m_bExecutePlugins; @@ -242,7 +228,6 @@ class SvtSecurityOptions_Impl : public ConfigItem void SetBasicMode ( EBasicSecurityMode eMode ) ; }; - // constructor SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() @@ -306,7 +291,6 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() EnableNotification( seqNames ); } - // destructor SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl() @@ -408,7 +392,6 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu } break; - // xmlsec05 deprecated case PROPERTYHANDLE_STAROFFICEBASIC: { @@ -438,7 +421,6 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu break; // xmlsec05 deprecated - #if OSL_DEBUG_LEVEL > 1 default: DBG_ASSERT( false, "SvtSecurityOptions_Impl::SetProperty()\nUnknown property!\n" ); @@ -729,7 +711,6 @@ void SvtSecurityOptions_Impl::Commit() lPropertyValues[ 2 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA; lPropertyValues[ 2 ].Value <<= m_seqTrustedAuthors[ i ][2]; - SetSetProperties( PROPERTYNAME_MACRO_TRUSTEDAUTHORS, lPropertyValues ); } @@ -749,7 +730,6 @@ void SvtSecurityOptions_Impl::Commit() } break; - // xmlsec05 deprecated case PROPERTYHANDLE_STAROFFICEBASIC: { @@ -781,7 +761,6 @@ void SvtSecurityOptions_Impl::Commit() break; // xmlsec05 deprecated - default: bDone = false; } @@ -855,7 +834,6 @@ bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) break; // xmlsec05 deprecated - default: bReadonly = true; } @@ -992,7 +970,6 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames() return seqPropertyNames; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -1146,9 +1123,6 @@ Mutex& SvtSecurityOptions::GetInitMutex() return theSecurityOptionsMutex::get(); } - - - // xmlsec05 deprecated EBasicSecurityMode SvtSecurityOptions_Impl::GetBasicMode() const @@ -1211,7 +1185,6 @@ void SvtSecurityOptions_Impl::SetConfirmationEnabled( bool bSet ) } } - bool SvtSecurityOptions::IsExecutePlugins() const { MutexGuard aGuard( GetInitMutex() ); diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 7c6b0f56b036..5179bab87fe1 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -37,7 +37,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; - SvtSysLocaleOptions_Impl* SvtSysLocaleOptions::pOptions = NULL; sal_Int32 SvtSysLocaleOptions::nRefCount = 0; namespace @@ -102,7 +101,6 @@ public: const LanguageTag& GetRealUILocale() { return m_aRealUILocale; } }; - #define ROOTNODE_SYSLOCALE OUString("Setup/L10N") #define PROPERTYNAME_LOCALE OUString("ooSetupSystemLocale") @@ -137,8 +135,6 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames() return seqPropertyNames; } - - SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl() : ConfigItem( ROOTNODE_SYSLOCALE ) , m_aRealLocale( LANGUAGE_SYSTEM) @@ -252,7 +248,6 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl() MakeRealUILocale(); } - SvtSysLocaleOptions_Impl::~SvtSysLocaleOptions_Impl() { if ( IsModified() ) @@ -314,7 +309,6 @@ bool SvtSysLocaleOptions_Impl::IsReadOnly( SvtSysLocaleOptions::EOption eOption return bReadOnly; } - void SvtSysLocaleOptions_Impl::Commit() { const Sequence< OUString > aOrgNames = GetPropertyNames(); @@ -395,7 +389,6 @@ void SvtSysLocaleOptions_Impl::Commit() ClearModified(); } - void SvtSysLocaleOptions_Impl::SetLocaleString( const OUString& rStr ) { if (!m_bROLocale && rStr != m_aLocaleString ) @@ -520,8 +513,6 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNa NotifyListeners( nHint ); } - - SvtSysLocaleOptions::SvtSysLocaleOptions() { MutexGuard aGuard( GetMutex() ); @@ -535,7 +526,6 @@ SvtSysLocaleOptions::SvtSysLocaleOptions() pOptions->AddListener(this); } - SvtSysLocaleOptions::~SvtSysLocaleOptions() { MutexGuard aGuard( GetMutex() ); @@ -547,7 +537,6 @@ SvtSysLocaleOptions::~SvtSysLocaleOptions() } } - // static Mutex& SvtSysLocaleOptions::GetMutex() { @@ -566,28 +555,24 @@ Mutex& SvtSysLocaleOptions::GetMutex() return *pMutex; } - bool SvtSysLocaleOptions::IsModified() { MutexGuard aGuard( GetMutex() ); return pOptions->IsModified(); } - void SvtSysLocaleOptions::Commit() { MutexGuard aGuard( GetMutex() ); pOptions->Commit(); } - void SvtSysLocaleOptions::BlockBroadcasts( bool bBlock ) { MutexGuard aGuard( GetMutex() ); pOptions->BlockBroadcasts( bBlock ); } - const OUString& SvtSysLocaleOptions::GetLocaleConfigString() const { MutexGuard aGuard( GetMutex() ); @@ -612,7 +597,6 @@ const OUString& SvtSysLocaleOptions::GetCurrencyConfigString() const return pOptions->GetCurrencyString(); } - void SvtSysLocaleOptions::SetCurrencyConfigString( const OUString& rStr ) { MutexGuard aGuard( GetMutex() ); @@ -680,7 +664,6 @@ void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( OUString& rAbbrev, } } - // static OUString SvtSysLocaleOptions::CreateCurrencyConfigString( const OUString& rAbbrev, LanguageType eLang ) @@ -698,7 +681,6 @@ OUString SvtSysLocaleOptions::CreateCurrencyConfigString( return rAbbrev; } - // static void SvtSysLocaleOptions::SetCurrencyChangeLink( const Link& rLink ) { @@ -707,7 +689,6 @@ void SvtSysLocaleOptions::SetCurrencyChangeLink( const Link& rLink ) CurrencyChangeLink::get() = rLink; } - // static const Link& SvtSysLocaleOptions::GetCurrencyChangeLink() { @@ -715,7 +696,6 @@ const Link& SvtSysLocaleOptions::GetCurrencyChangeLink() return CurrencyChangeLink::get(); } - void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint ) { if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY ) @@ -743,5 +723,4 @@ const LanguageTag & SvtSysLocaleOptions::GetRealUILanguageTag() const return pOptions->GetRealUILocale(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 55697d585110..0f9299121f8e 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/useroptions.hxx> #include <unotools/configmgr.hxx> @@ -257,7 +256,6 @@ osl::Mutex& SvtUserOptions::GetInitMutex() return theUserOptionsMutex::get(); } - OUString SvtUserOptions::GetCompany () const { return GetToken(USER_OPT_COMPANY); } OUString SvtUserOptions::GetFirstName () const { return GetToken(USER_OPT_FIRSTNAME); } OUString SvtUserOptions::GetLastName () const { return GetToken(USER_OPT_LASTNAME); } @@ -275,7 +273,6 @@ OUString SvtUserOptions::GetFax () const { return GetToken(USER_OPT_F OUString SvtUserOptions::GetEmail () const { return GetToken(USER_OPT_EMAIL); } OUString SvtUserOptions::GetCustomerNumber () const { return GetToken(USER_OPT_CUSTOMERNUMBER); } - void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { SetToken(USER_OPT_CUSTOMERNUMBER, sToken); } bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index c180c8d50522..1273c0418e77 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -68,10 +68,8 @@ sMsg.appendAscii("\"" ); \ } - // initialization! - SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Dialogs = NULL ; sal_Int32 SvtViewOptions::m_nRefCount_Dialogs = 0 ; SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_TabDialogs = NULL ; @@ -81,10 +79,8 @@ sal_Int32 SvtViewOptions::m_nRefCount_TabPages = 0 SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Windows = NULL ; sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0 ; - // private declarations! - /*-************************************************************************************************************ @descr declare one configuration item These struct hold information about one view item. But not all member are used for all entries! @@ -114,7 +110,6 @@ class IMPL_TViewData m_bDefault = true ; } - // write access - with reseting of default state void setWindowState( const OUString& sValue ) { @@ -125,7 +120,6 @@ class IMPL_TViewData m_sWindowState = sValue; } - void setUserData( const css::uno::Sequence< css::beans::NamedValue >& lValue ) { m_bDefault = ( @@ -135,7 +129,6 @@ class IMPL_TViewData m_lUserData = lValue; } - void setPageID( sal_Int32 nValue ) { m_bDefault = ( @@ -145,7 +138,6 @@ class IMPL_TViewData m_nPageID = nValue; } - void setVisible( bool bValue ) { m_bDefault = ( @@ -155,14 +147,12 @@ class IMPL_TViewData m_bVisible = bValue; } - // read access OUString getWindowState() { return m_sWindowState; } css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData ; } sal_Int32 getPageID () { return m_nPageID ; } bool getVisible () { return m_bVisible ; } - // special operation for easy access on user data void setUserItem( const OUString& sName , const css::uno::Any& aValue ) @@ -195,7 +185,6 @@ class IMPL_TViewData } } - css::uno::Any getUserItem( const OUString& sName ) { // default value - if item not exist! @@ -213,7 +202,6 @@ class IMPL_TViewData return aValue; } - // check for default items bool isDefault() { return m_bDefault; } @@ -278,12 +266,10 @@ class SvtViewOptionsBase_Impl const OUString& sItem , const css::uno::Any& aValue ); - private: css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode , bool bCreateIfMissing); - private: OUString m_sListName; css::uno::Reference< css::container::XNameAccess > m_xRoot; @@ -464,7 +450,6 @@ OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName ) return sWindowState; } - void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , const OUString& sState ) { @@ -486,7 +471,6 @@ void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , } } - css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -526,7 +510,6 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat return css::uno::Sequence< css::beans::NamedValue >(); } - void SvtViewOptionsBase_Impl::SetUserData( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ) { @@ -562,7 +545,6 @@ void SvtViewOptionsBase_Impl::SetUserData( const OUString& } } - css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , const OUString& sItem ) { @@ -593,7 +575,6 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , return aItem; } - void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , const OUString& sItem , const css::uno::Any& aValue ) @@ -624,7 +605,6 @@ void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , } } - sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -649,7 +629,6 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) return nID; } - void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , sal_Int32 nID ) { @@ -671,7 +650,6 @@ void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , } } - SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -701,7 +679,6 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri return eState; } - void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , bool bVisible ) { @@ -759,7 +736,6 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet return xNode; } - // constructor SvtViewOptions::SvtViewOptions( EViewType eType , @@ -822,7 +798,6 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } } - // destructor SvtViewOptions::~SvtViewOptions() @@ -880,7 +855,6 @@ SvtViewOptions::~SvtViewOptions() } } - // public method bool SvtViewOptions::Exists() const @@ -911,7 +885,6 @@ bool SvtViewOptions::Exists() const return bExists; } - // public method bool SvtViewOptions::Delete() @@ -942,7 +915,6 @@ bool SvtViewOptions::Delete() return bState; } - // public method OUString SvtViewOptions::GetWindowState() const @@ -973,7 +945,6 @@ OUString SvtViewOptions::GetWindowState() const return sState; } - // public method void SvtViewOptions::SetWindowState( const OUString& sState ) @@ -1002,7 +973,6 @@ void SvtViewOptions::SetWindowState( const OUString& sState ) } } - // public method sal_Int32 SvtViewOptions::GetPageID() const @@ -1020,7 +990,6 @@ sal_Int32 SvtViewOptions::GetPageID() const return nID; } - // public method void SvtViewOptions::SetPageID( sal_Int32 nID ) @@ -1036,7 +1005,6 @@ void SvtViewOptions::SetPageID( sal_Int32 nID ) m_pDataContainer_TabDialogs->SetPageID( m_sViewName, nID ); } - // public method bool SvtViewOptions::IsVisible() const @@ -1055,7 +1023,6 @@ bool SvtViewOptions::IsVisible() const return bState; } - // public method void SvtViewOptions::SetVisible( bool bState ) @@ -1071,7 +1038,6 @@ void SvtViewOptions::SetVisible( bool bState ) m_pDataContainer_Windows->SetVisible( m_sViewName, bState ); } - // public method bool SvtViewOptions::HasVisible() const @@ -1090,7 +1056,6 @@ bool SvtViewOptions::HasVisible() const return bState; } - css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const { // Ready for multithreading @@ -1119,7 +1084,6 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const return lData; } - void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedValue >& lData ) { // Ready for multithreading @@ -1146,7 +1110,6 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal } } - css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const { // Ready for multithreading @@ -1175,7 +1138,6 @@ css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const return aItem; } - void SvtViewOptions::SetUserItem( const OUString& sName , const css::uno::Any& aValue ) { @@ -1208,7 +1170,6 @@ namespace class theViewOptionsMutex : public rtl::Static<osl::Mutex, theViewOptionsMutex>{}; } - // private method ::osl::Mutex& SvtViewOptions::GetOwnStaticMutex() diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 86c9e54add1d..89379c58cfa3 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/xmlaccelcfg.hxx> #include <vector> @@ -27,7 +26,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; - #define ELEMENT_ACCELERATORLIST "acceleratorlist" #define ELEMENT_ACCELERATORITEM "item" @@ -91,7 +89,6 @@ void SAL_CALL OReadAccelatorDocumentHandler::endDocument(void) } } - void SAL_CALL OReadAccelatorDocumentHandler::startElement( const OUString& aElementName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -151,13 +148,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadAccelatorDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index c7b96eedbe29..5ca9ad966aff 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/strbuf.hxx> #include <tools/debug.hxx> #include <unotools/calendarwrapper.hxx> @@ -28,10 +27,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - const double MILLISECONDS_PER_DAY = 1000.0 * 60.0 * 60.0 * 24.0; - CalendarWrapper::CalendarWrapper( const Reference< uno::XComponentContext > & rxContext ) @@ -45,7 +42,6 @@ CalendarWrapper::~CalendarWrapper() { } - void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale ) { try @@ -59,7 +55,6 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& } } - void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) { try @@ -74,7 +69,6 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun: } } - ::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const { try @@ -90,7 +84,6 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun: return ::com::sun::star::uno::Sequence< OUString > (0); } - OUString CalendarWrapper::getUniqueID() const { try @@ -105,7 +98,6 @@ OUString CalendarWrapper::getUniqueID() const return OUString(); } - void CalendarWrapper::setDateTime( double nTimeInDays ) { try @@ -119,7 +111,6 @@ void CalendarWrapper::setDateTime( double nTimeInDays ) } } - double CalendarWrapper::getDateTime() const { try @@ -134,7 +125,6 @@ double CalendarWrapper::getDateTime() const return 0.0; } - sal_Int32 CalendarWrapper::getCombinedOffsetInMillis( sal_Int16 nParentFieldIndex, sal_Int16 nChildFieldIndex ) const { @@ -158,21 +148,18 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis( return nOffset; } - sal_Int32 CalendarWrapper::getZoneOffsetInMillis() const { return getCombinedOffsetInMillis( CalendarFieldIndex::ZONE_OFFSET, CalendarFieldIndex::ZONE_OFFSET_SECOND_MILLIS); } - sal_Int32 CalendarWrapper::getDSTOffsetInMillis() const { return getCombinedOffsetInMillis( CalendarFieldIndex::DST_OFFSET, CalendarFieldIndex::DST_OFFSET_SECOND_MILLIS); } - void CalendarWrapper::setLocalDateTime( double nTimeInDays ) { try @@ -223,7 +210,6 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays ) } } - double CalendarWrapper::getLocalDateTime() const { try @@ -244,7 +230,6 @@ double CalendarWrapper::getLocalDateTime() const return 0.0; } - void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) { try @@ -258,7 +243,6 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) } } - bool CalendarWrapper::isValid() const { try @@ -273,7 +257,6 @@ bool CalendarWrapper::isValid() const return false; } - sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const { try @@ -288,7 +271,6 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const return 0; } - void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ) { try @@ -302,7 +284,6 @@ void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ) } } - sal_Int16 CalendarWrapper::getFirstDayOfWeek() const { try @@ -317,7 +298,6 @@ sal_Int16 CalendarWrapper::getFirstDayOfWeek() const return 0; } - sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const { try @@ -332,7 +312,6 @@ sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const return 0; } - sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const { try @@ -347,7 +326,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return 0; } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getMonths() const { try @@ -362,7 +340,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getDays() const { try @@ -377,7 +354,6 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType ) const { try @@ -392,7 +368,6 @@ OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_I return OUString(); } - // --- XExtendedCalendar ----------------------------------------------------- OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) const @@ -409,7 +384,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return OUString(); } - // --- XCalendar3 ------------------------------------------------------------ ::com::sun::star::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const @@ -426,7 +400,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return ::com::sun::star::i18n::Calendar2(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const { try @@ -441,7 +414,6 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_ return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const { try diff --git a/unotools/source/i18n/caserotate.cxx b/unotools/source/i18n/caserotate.cxx index 23d0813cca2b..14a2d7a0624f 100644 --- a/unotools/source/i18n/caserotate.cxx +++ b/unotools/source/i18n/caserotate.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "unotools/caserotate.hxx" #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index ba86a2b531fc..ac627ecf44b1 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/processfactory.hxx> #include <unotools/charclass.hxx> #include <rtl/character.hxx> @@ -29,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - CharClass::CharClass( const Reference< uno::XComponentContext > & rxContext, const LanguageTag& rLanguageTag @@ -40,7 +38,6 @@ CharClass::CharClass( xCC = CharacterClassification::create( rxContext ); } - CharClass::CharClass( const LanguageTag& rLanguageTag ) : @@ -49,33 +46,28 @@ CharClass::CharClass( xCC = CharacterClassification::create( comphelper::getProcessComponentContext() ); } - CharClass::~CharClass() { } - void CharClass::setLanguageTag( const LanguageTag& rLanguageTag ) { ::osl::MutexGuard aGuard( aMutex ); maLanguageTag = rLanguageTag; } - const LanguageTag& CharClass::getLanguageTag() const { ::osl::MutexGuard aGuard( aMutex ); return maLanguageTag; } - const ::com::sun::star::lang::Locale& CharClass::getMyLocale() const { ::osl::MutexGuard aGuard( aMutex ); return maLanguageTag.getLocale(); } - // static bool CharClass::isAsciiNumeric( const OUString& rStr ) { @@ -94,7 +86,6 @@ bool CharClass::isAsciiNumeric( const OUString& rStr ) return true; } - // static bool CharClass::isAsciiAlpha( const OUString& rStr ) { @@ -113,8 +104,6 @@ bool CharClass::isAsciiAlpha( const OUString& rStr ) return true; } - - bool CharClass::isAlpha( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -136,8 +125,6 @@ bool CharClass::isAlpha( const OUString& rStr, sal_Int32 nPos ) const } } - - bool CharClass::isLetter( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -159,7 +146,6 @@ bool CharClass::isLetter( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetter( const OUString& rStr ) const { try @@ -176,7 +162,6 @@ bool CharClass::isLetter( const OUString& rStr ) const } } - bool CharClass::isDigit( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[ nPos ]; @@ -198,7 +183,6 @@ bool CharClass::isDigit( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isNumeric( const OUString& rStr ) const { try @@ -215,7 +199,6 @@ bool CharClass::isNumeric( const OUString& rStr ) const } } - bool CharClass::isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -237,7 +220,6 @@ bool CharClass::isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; @@ -259,7 +241,6 @@ bool CharClass::isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const } } - bool CharClass::isLetterNumeric( const OUString& rStr ) const { try @@ -340,7 +321,6 @@ sal_Int16 CharClass::getType( const OUString& rStr, sal_Int32 nPos ) const } } - sal_Int16 CharClass::getCharacterDirection( const OUString& rStr, sal_Int32 nPos ) const { try @@ -357,7 +337,6 @@ sal_Int16 CharClass::getCharacterDirection( const OUString& rStr, sal_Int32 nPos } } - sal_Int16 CharClass::getScript( const OUString& rStr, sal_Int32 nPos ) const { try @@ -374,7 +353,6 @@ sal_Int16 CharClass::getScript( const OUString& rStr, sal_Int32 nPos ) const } } - sal_Int32 CharClass::getCharacterType( const OUString& rStr, sal_Int32 nPos ) const { try @@ -391,7 +369,6 @@ sal_Int32 CharClass::getCharacterType( const OUString& rStr, sal_Int32 nPos ) co } } - sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try @@ -408,7 +385,6 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - ::com::sun::star::i18n::ParseResult CharClass::parseAnyToken( const OUString& rStr, sal_Int32 nPos, @@ -433,7 +409,6 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - ::com::sun::star::i18n::ParseResult CharClass::parsePredefinedToken( sal_Int32 nTokenType, const OUString& rStr, @@ -459,6 +434,4 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index d8a1a8b4e638..e345f9794b5f 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/intlwrapper.hxx" #include <com/sun/star/i18n/CollatorOptions.hpp> #include <i18nlangtag/mslangid.hxx> @@ -53,13 +52,11 @@ IntlWrapper::~IntlWrapper() delete pCaseCollator; } - void IntlWrapper::ImplNewLocaleData() const { ((IntlWrapper*)this)->pLocaleData = new LocaleDataWrapper( m_xContext, maLanguageTag ); } - void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const { CollatorWrapper* p = new CollatorWrapper( m_xContext ); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 3ef632634b36..671ed8a91c99 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <string> @@ -95,7 +94,6 @@ LocaleDataWrapper::~LocaleDataWrapper() { } - void LocaleDataWrapper::setLanguageTag( const LanguageTag& rLanguageTag ) { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nCriticalChange ); @@ -103,21 +101,18 @@ void LocaleDataWrapper::setLanguageTag( const LanguageTag& rLanguageTag ) invalidateData(); } - const LanguageTag& LocaleDataWrapper::getLanguageTag() const { ::utl::ReadWriteGuard aGuard( aMutex ); return maLanguageTag; } - const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const { ::utl::ReadWriteGuard aGuard( aMutex ); return maLanguageTag.getLocale(); } - void LocaleDataWrapper::invalidateData() { aCurrSymbol = ""; @@ -145,7 +140,6 @@ void LocaleDataWrapper::invalidateData() cCurrZeroChar = '0'; } - /* FIXME-BCP47: locale data should provide a language tag instead that could be * passed on. */ ::com::sun::star::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const @@ -161,7 +155,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::LanguageCountryInfo(); } - ::com::sun::star::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const { try @@ -175,7 +168,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::LocaleDataItem(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const { try @@ -189,7 +181,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const { try @@ -203,7 +194,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0); } - ::com::sun::star::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const { try @@ -217,7 +207,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::i18n::ForbiddenCharacters(); } - ::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const { try @@ -231,7 +220,6 @@ void LocaleDataWrapper::invalidateData() return ::com::sun::star::uno::Sequence< OUString >(0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const { uno::Sequence< lang::Locale > &rInstalledLocales = InstalledLocales::get(); @@ -250,7 +238,6 @@ void LocaleDataWrapper::invalidateData() return rInstalledLocales; } - // --- Impl and helpers ---------------------------------------------------- // static @@ -355,7 +342,6 @@ const OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const return aLocaleItem[nItem]; } - void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) { if ( !bLocaleDataItemValid ) @@ -421,7 +407,6 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) } } - void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) { if ( !bReservedWordValid ) @@ -434,7 +419,6 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) aReservedWord[nWord] = aReservedWordSeq[nWord]; } - const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -451,7 +435,6 @@ const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const return aReservedWord[nWord]; } - MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& rMS ) const { //! TODO: could be cached too @@ -461,7 +444,6 @@ MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& return MEASURE_US; } - void LocaleDataWrapper::getDefaultCalendarImpl() { if (!xDefaultCalendar) @@ -485,7 +467,6 @@ void LocaleDataWrapper::getDefaultCalendarImpl() } } - const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -497,19 +478,16 @@ const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper return xDefaultCalendar; } - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const { return getDefaultCalendar()->Days; } - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const { return getDefaultCalendar()->Months; } - // --- currencies ----------------------------------------------------- const OUString& LocaleDataWrapper::getCurrSymbol() const @@ -523,7 +501,6 @@ const OUString& LocaleDataWrapper::getCurrSymbol() const return aCurrSymbol; } - const OUString& LocaleDataWrapper::getCurrBankSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -535,7 +512,6 @@ const OUString& LocaleDataWrapper::getCurrBankSymbol() const return aCurrBankSymbol; } - sal_uInt16 LocaleDataWrapper::getCurrPositiveFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -547,7 +523,6 @@ sal_uInt16 LocaleDataWrapper::getCurrPositiveFormat() const return nCurrPositiveFormat; } - sal_uInt16 LocaleDataWrapper::getCurrNegativeFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -559,7 +534,6 @@ sal_uInt16 LocaleDataWrapper::getCurrNegativeFormat() const return nCurrNegativeFormat; } - sal_uInt16 LocaleDataWrapper::getCurrDigits() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -571,7 +545,6 @@ sal_uInt16 LocaleDataWrapper::getCurrDigits() const return nCurrDigits; } - void LocaleDataWrapper::getCurrSymbolsImpl() { Sequence< Currency2 > aCurrSeq = getAllCurrencies(); @@ -607,7 +580,6 @@ void LocaleDataWrapper::getCurrSymbolsImpl() nCurrDigits = pCurrArr[nElem].DecimalPlaces; } - void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) @@ -829,7 +801,6 @@ void LocaleDataWrapper::getCurrFormatsImpl() } } - // --- date ----------------------------------------------------------- DateFormat LocaleDataWrapper::getDateFormat() const @@ -843,7 +814,6 @@ DateFormat LocaleDataWrapper::getDateFormat() const return (DateFormat) nDateFormat; } - DateFormat LocaleDataWrapper::getLongDateFormat() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -855,7 +825,6 @@ DateFormat LocaleDataWrapper::getLongDateFormat() const return (DateFormat) nLongDateFormat; } - DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) { // Only some european versions were translated, the ones with different @@ -937,7 +906,6 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) } } - void LocaleDataWrapper::getDateFormatsImpl() { NumberFormatCodeWrapper aNumberFormatCode( m_xContext, getMyLocale() ); @@ -1026,7 +994,6 @@ void LocaleDataWrapper::getDateFormatsImpl() } } - // --- digit grouping ------------------------------------------------- void LocaleDataWrapper::getDigitGroupingImpl() @@ -1061,7 +1028,6 @@ void LocaleDataWrapper::getDigitGroupingImpl() } } - const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -1073,7 +1039,6 @@ const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGr return aGrouping; } - // --- simple number formatting helpers ------------------------------- // The ImplAdd... methods are taken from class International and modified to @@ -1104,7 +1069,6 @@ static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber ) return pBuf; } - static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber, int nMinLen ) { // fill temp buffer with digits @@ -1139,7 +1103,6 @@ static sal_Unicode* ImplAddUNum( sal_Unicode* pBuf, sal_uInt64 nNumber, int nMin return pBuf; } - static sal_Unicode* ImplAdd2UNum( sal_Unicode* pBuf, sal_uInt16 nNumber, bool bLeading ) { DBG_ASSERT( nNumber < 100, "ImplAdd2UNum() - Number >= 100" ); @@ -1200,7 +1163,6 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr ) return pBuf; } - inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) { *pBuf = c; @@ -1208,14 +1170,12 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) return pBuf; } - inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen ) { memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) ); return pBuf + nLen; } - sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const @@ -1323,7 +1283,6 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, return pBuf; } - // --- simple date and time formatting -------------------------------- OUString LocaleDataWrapper::getDate( const Date& rDate ) const @@ -1372,7 +1331,6 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const return OUString(aBuf, pBuf-aBuf); } - OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1401,7 +1359,6 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec return OUString(aBuf, pBuf - aBuf); } - OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek, bool bDayOfMonthWithLeadingZero, sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const @@ -1446,7 +1403,6 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa return aStr; } - OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1477,7 +1433,6 @@ OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100 return OUString(aBuf, pBuf-aBuf); } - // --- simple number formatting --------------------------------------- inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals ) @@ -1491,7 +1446,6 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal return nGuess; } - OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { @@ -1712,7 +1666,6 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, return aNumber; } - // --- mixed ---------------------------------------------------------- LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const @@ -1721,7 +1674,6 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const return LanguageTag( lang::Locale( aLCInfo.Language, aLCInfo.Country, aLCInfo.Variant )); } - OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1735,14 +1687,12 @@ OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const return aDebugMsg.makeStringAndClear(); } - // static void LocaleDataWrapper::outputCheckMessage( const OUString& rMsg ) { outputCheckMessage(OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); } - // static void LocaleDataWrapper::outputCheckMessage( const char* pStr ) { @@ -1751,7 +1701,6 @@ void LocaleDataWrapper::outputCheckMessage( const char* pStr ) OSL_TRACE("%s", pStr); } - // static void LocaleDataWrapper::evaluateLocaleDataChecking() { @@ -1784,7 +1733,6 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() } } - // --- XLocaleData3 ---------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const @@ -1800,7 +1748,6 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0); } - // --- XLocaleData4 ---------------------------------------------------------- ::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index 2a9ba2af0556..2b0c1c01e6d2 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/nativenumberwrapper.hxx> #include <tools/debug.hxx> #include <com/sun/star/i18n/NativeNumberSupplier.hpp> @@ -31,12 +30,10 @@ NativeNumberWrapper::NativeNumberWrapper( xNNS = i18n::NativeNumberSupplier::create(rxContext); } - NativeNumberWrapper::~NativeNumberWrapper() { } - OUString NativeNumberWrapper::getNativeNumberString( const OUString& rNumberString, @@ -55,7 +52,6 @@ NativeNumberWrapper::getNativeNumberString( return OUString(); } - i18n::NativeNumberXmlAttributes NativeNumberWrapper::convertToXmlAttributes( const ::com::sun::star::lang::Locale& rLocale, @@ -73,7 +69,6 @@ NativeNumberWrapper::convertToXmlAttributes( return i18n::NativeNumberXmlAttributes(); } - sal_Int16 NativeNumberWrapper::convertFromXmlAttributes( const i18n::NativeNumberXmlAttributes& rAttr ) const @@ -90,5 +85,4 @@ NativeNumberWrapper::convertFromXmlAttributes( return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx index 6c7954f0595b..f139976f01f9 100644 --- a/unotools/source/i18n/numberformatcodewrapper.cxx +++ b/unotools/source/i18n/numberformatcodewrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/numberformatcodewrapper.hxx> #include <com/sun/star/i18n/NumberFormatMapper.hpp> #include <tools/debug.hxx> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; - NumberFormatCodeWrapper::NumberFormatCodeWrapper( const Reference< uno::XComponentContext > & rxContext, const lang::Locale& rLocale @@ -36,18 +34,15 @@ NumberFormatCodeWrapper::NumberFormatCodeWrapper( xNFC = i18n::NumberFormatMapper::create( rxContext ); } - NumberFormatCodeWrapper::~NumberFormatCodeWrapper() { } - void NumberFormatCodeWrapper::setLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLocale = rLocale; } - ::com::sun::star::i18n::NumberFormatCode NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const { @@ -62,7 +57,6 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const return ::com::sun::star::i18n::NumberFormatCode(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const { @@ -77,7 +71,6 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0); } - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > NumberFormatCodeWrapper::getAllFormatCodes() const { diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx index 08327250fe8f..5c01cc07d0fc 100644 --- a/unotools/source/i18n/readwritemutexguard.cxx +++ b/unotools/source/i18n/readwritemutexguard.cxx @@ -20,7 +20,6 @@ #include "unotools/readwritemutexguard.hxx" #include <tools/debug.hxx> - namespace utl { ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP, @@ -60,7 +59,6 @@ ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP, } } - ReadWriteGuard::~ReadWriteGuard() { if ( nMode & ReadWriteGuardMode::nWrite ) @@ -79,7 +77,6 @@ ReadWriteGuard::~ReadWriteGuard() } } - void ReadWriteGuard::changeReadToWrite() { bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical)); diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 27e2405bd1d2..17f8fe81c9f2 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -32,11 +32,9 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - namespace utl { - SearchParam::SearchParam( const OUString &rText, SearchType eType, bool bCaseSensitive, @@ -197,7 +195,6 @@ void TextSearch::SetLocale( const ::com::sun::star::util::SearchOptions& rOption xTextSearch = getXTextSearch( aSOpt ); } - TextSearch::~TextSearch() { } @@ -238,7 +235,6 @@ bool TextSearch::SearchForward( const OUString &rStr, return nRet; } - bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart, sal_Int32* pEnde, SearchResult* pRes ) { @@ -358,8 +354,6 @@ void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, const OUString &r } } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 7a457e0ebf82..ecaaf0c8196b 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/transliterationwrapper.hxx> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> @@ -38,12 +37,10 @@ TransliterationWrapper::TransliterationWrapper( { } - TransliterationWrapper::~TransliterationWrapper() { } - OUString TransliterationWrapper::transliterate(const OUString& rStr, sal_uInt16 nLang, sal_Int32 nStart, sal_Int32 nLen, Sequence <sal_Int32>* pOffset ) @@ -68,7 +65,6 @@ OUString TransliterationWrapper::transliterate(const OUString& rStr, sal_uInt16 return sRet; } - OUString TransliterationWrapper::transliterate( const OUString& rStr, sal_Int32 nStart, sal_Int32 nLen, Sequence <sal_Int32>* pOffset ) const @@ -101,7 +97,6 @@ bool TransliterationWrapper::needLanguageForTheMode() const (sal_uInt32) TransliterationModulesExtra::TOGGLE_CASE == (sal_uInt32) nType; } - void TransliterationWrapper::setLanguageLocaleImpl( sal_uInt16 nLang ) { if( LANGUAGE_NONE == nLang ) @@ -109,7 +104,6 @@ void TransliterationWrapper::setLanguageLocaleImpl( sal_uInt16 nLang ) aLanguageTag.reset( nLang); } - void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) { bool bLoad = bFirstCall; @@ -143,7 +137,6 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) } } - void TransliterationWrapper::loadModuleImpl() const { if ( bFirstCall ) @@ -162,7 +155,6 @@ void TransliterationWrapper::loadModuleImpl() const bFirstCall = false; } - void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName, sal_uInt16 nLang ) { @@ -184,7 +176,6 @@ void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName, bFirstCall = false; } - bool TransliterationWrapper::equals( const OUString& rStr1, sal_Int32 nPos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& rStr2, sal_Int32 nPos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) const @@ -219,7 +210,6 @@ sal_Int32 TransliterationWrapper::compareString( const OUString& rStr1, const OU return 0; } - // --- helpers -------------------------------------------------------- bool TransliterationWrapper::isEqual( const OUString& rStr1, const OUString& rStr2 ) const @@ -231,7 +221,6 @@ bool TransliterationWrapper::isEqual( const OUString& rStr1, const OUString& rSt return bMatch; } - bool TransliterationWrapper::isMatch( const OUString& rStr1, const OUString& rStr2 ) const { sal_Int32 nMatch1, nMatch2; diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index bbb53532c4af..01f329b22066 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/atom.hxx> using namespace utl; @@ -54,8 +53,6 @@ const OUString& AtomProvider::getString( int nAtom ) const return it == m_aStringMap.end() ? aEmpty : it->second; } - - MultiAtomProvider::MultiAtomProvider() { } diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx index 8c0328c33f7d..4044fa775e4b 100644 --- a/unotools/source/misc/closeveto.cxx +++ b/unotools/source/misc/closeveto.cxx @@ -25,11 +25,9 @@ #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> - namespace utl { - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -46,7 +44,6 @@ namespace utl using ::com::sun::star::util::CloseVetoException; using ::com::sun::star::lang::EventObject; - //= CloseListener_Impl typedef ::cppu::WeakImplHelper1 < XCloseListener @@ -77,7 +74,6 @@ namespace utl bool m_bHasOwnership; }; - void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, sal_Bool i_deliverOwnership ) throw (CloseVetoException, RuntimeException, std::exception) { (void)i_source; @@ -88,19 +84,16 @@ namespace utl throw CloseVetoException(); } - void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source ) throw (RuntimeException, std::exception) { (void)i_source; } - void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source ) throw (RuntimeException, std::exception) { (void)i_source; } - //= CloseVeto_Data struct CloseVeto_Data @@ -109,7 +102,6 @@ namespace utl ::rtl::Reference< CloseListener_Impl > pListener; }; - //= operations namespace @@ -124,7 +116,6 @@ namespace utl i_data.xCloseable->addCloseListener( i_data.pListener.get() ); } - void lcl_deinit( CloseVeto_Data& i_data ) { if ( !i_data.xCloseable.is() ) @@ -146,24 +137,19 @@ namespace utl } } - //= CloseVeto - CloseVeto::CloseVeto( const Reference< XInterface >& i_closeable ) :m_pData( new CloseVeto_Data ) { lcl_init( *m_pData, i_closeable ); } - CloseVeto::~CloseVeto() { lcl_deinit( *m_pData ); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index 8a01cae59864..99292a9205d3 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.cxx @@ -23,12 +23,9 @@ #include <osl/diagnose.h> #include <rtl/strbuf.hxx> - namespace utl { - - //= OComponentResModuleImpl /** PIMPL-class for OComponentResourceModule @@ -69,14 +66,12 @@ namespace utl OComponentResModuleImpl& operator=( const OComponentResModuleImpl& ); // never implemented }; - void OComponentResModuleImpl::freeResManager() { delete m_pResources, m_pResources = NULL; m_bInitialized = false; } - ResMgr* OComponentResModuleImpl::getResManager() { if ( !m_pResources && !m_bInitialized ) @@ -95,43 +90,35 @@ namespace utl return m_pResources; } - //= OComponentResourceModule - OComponentResourceModule::OComponentResourceModule( const OString& _rResFilePrefix ) :BaseClass() ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix ) ) { } - OComponentResourceModule::~OComponentResourceModule() { } - ResMgr* OComponentResourceModule::getResManager() { ::osl::MutexGuard aGuard( m_aMutex ); return m_pImpl->getResManager(); } - void OComponentResourceModule::onFirstClient() { BaseClass::onFirstClient(); } - void OComponentResourceModule::onLastClient() { m_pImpl->freeResManager(); BaseClass::onLastClient(); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 71861c34b6c4..f898f79bd4f8 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -24,7 +24,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> - namespace { /** convert string to number with optional min and max values */ @@ -177,7 +176,6 @@ namespace } } - namespace utl { @@ -188,13 +186,11 @@ void typeConvert(const Date& _rDate, starutil::Date& _rOut) _rOut.Year = _rDate.GetYear(); } - void typeConvert(const starutil::Date& _rDate, Date& _rOut) { _rOut = Date(_rDate.Day, _rDate.Month, _rDate.Year); } - void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut) { _rOut.Year = _rDateTime.GetYear(); @@ -206,7 +202,6 @@ void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut) _rOut.NanoSeconds = _rDateTime.GetNanoSec(); } - void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut) { Date aDate(_rDateTime.Day, _rDateTime.Month, _rDateTime.Year); @@ -214,7 +209,6 @@ void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut) _rOut = DateTime(aDate, aTime); } - void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut) { _rOut.Day = _rDateTime.Day; @@ -222,7 +216,6 @@ void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut) _rOut.Year = _rDateTime.Year; } - void extractTime(const starutil::DateTime& _rDateTime, starutil::Time& _rOut) { _rOut.Hours = _rDateTime.Hours; @@ -231,7 +224,6 @@ void extractTime(const starutil::DateTime& _rDateTime, starutil::Time& _rOut) _rOut.NanoSeconds = _rDateTime.NanoSeconds; } - OUString toISO8601(const starutil::DateTime& rDateTime) { OUStringBuffer rBuffer; @@ -494,5 +486,4 @@ bool ISO8601parseTime(const OUString &aTimeStr, starutil::Time& rTime) } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 42ef51c13dc0..90f9b459855b 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -26,11 +26,9 @@ #include <list> - namespace utl { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -49,14 +47,12 @@ namespace utl ListenerAdminData() : bAlreadyTerminated( false ), bCreatedAdapter( false ) { } }; - ListenerAdminData& getListenerAdminData() { static ListenerAdminData s_aData; return s_aData; } - //= OObserverImpl class OObserverImpl : public ::cppu::WeakImplHelper1< XTerminateListener > @@ -77,17 +73,14 @@ namespace utl virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - OObserverImpl::OObserverImpl() { } - OObserverImpl::~OObserverImpl() { } - void OObserverImpl::ensureObservation() { { @@ -111,7 +104,6 @@ namespace utl } } - void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception) { Listeners aToNotify; @@ -130,7 +122,6 @@ namespace utl } } - void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception) { // get the listeners @@ -158,7 +149,6 @@ namespace utl } } - void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception) { #if OSL_DEBUG_LEVEL > 0 @@ -169,10 +159,8 @@ namespace utl } } - //= DesktopTerminationObserver - void DesktopTerminationObserver::registerTerminationListener( ITerminationListener* _pListener ) { if ( !_pListener ) @@ -192,7 +180,6 @@ namespace utl OObserverImpl::ensureObservation(); } - void DesktopTerminationObserver::revokeTerminationListener( ITerminationListener* _pListener ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -210,8 +197,6 @@ namespace utl } } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx index 5b983e042bf0..f9be7465f3dc 100644 --- a/unotools/source/misc/eventlisteneradapter.cxx +++ b/unotools/source/misc/eventlisteneradapter.cxx @@ -25,15 +25,12 @@ #include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> - namespace utl { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //= OEventListenerImpl class OEventListenerImpl : public ::cppu::WeakImplHelper1< XEventListener > @@ -55,7 +52,6 @@ namespace utl virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; - OEventListenerImpl::OEventListenerImpl( OEventListenerAdapter* _pAdapter, const Reference< XComponent >& _rxComp ) :m_pAdapter(_pAdapter) { @@ -72,7 +68,6 @@ namespace utl m_xKeepMeAlive = xMeMyselfAndI; } - void OEventListenerImpl::dispose() { if (m_xComponent.is()) @@ -83,7 +78,6 @@ namespace utl } } - void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { Reference< XEventListener > xDeleteUponLeaving = m_xKeepMeAlive; @@ -93,7 +87,6 @@ namespace utl m_pAdapter->_disposing(_rSource); } - //= OEventListenerAdapterImpl struct OEventListenerAdapterImpl @@ -102,16 +95,13 @@ namespace utl ::std::vector< void* > aListeners; }; - //= OEventListenerAdapter - OEventListenerAdapter::OEventListenerAdapter() :m_pImpl(new OEventListenerAdapterImpl) { } - OEventListenerAdapter::~OEventListenerAdapter() { stopAllComponentListening( ); @@ -119,7 +109,6 @@ namespace utl m_pImpl = NULL; } - void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp ) { if ( m_pImpl->aListeners.empty() ) @@ -141,7 +130,6 @@ namespace utl while ( dispose != m_pImpl->aListeners.end() ); } - void OEventListenerAdapter::stopAllComponentListening( ) { for ( ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin(); @@ -156,7 +144,6 @@ namespace utl m_pImpl->aListeners.clear(); } - void OEventListenerAdapter::startComponentListening( const Reference< XComponent >& _rxComp ) { if (!_rxComp.is()) @@ -170,8 +157,6 @@ namespace utl m_pImpl->aListeners.push_back(pListenerImpl); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 171311069e48..2b6d4ac025f8 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -32,7 +32,6 @@ //various holes in OpenSymbol which were filled by StarSymbol, i.e. //destination mapping points which are empty in OpenSymbol - // note: the character mappings that are only approximations // are marked (with an empty comment) @@ -110,8 +109,6 @@ static const sal_Unicode aStarBatsTab[224] = 0, 0, 0, 0xE03a }; - - static const sal_Unicode aStarMathTab[224] = { // F020 @@ -186,8 +183,6 @@ static const sal_Unicode aStarMathTab[224] = 0x2124, 0x211a, 0x211d, 0x2102 }; - - static const sal_Unicode aWingDingsTab[224] = { // F020 @@ -262,8 +257,6 @@ static const sal_Unicode aWingDingsTab[224] = 0xe4c2, 0xe4c3, 0xe4c4, 0xe4c5 }; - - static const sal_Unicode aWingDings2Tab[224] = { // F020 @@ -338,8 +331,6 @@ static const sal_Unicode aWingDings2Tab[224] = 0, 0, 0, 0 }; - - static const sal_Unicode aWingDings3Tab[224] = { // F020 @@ -414,8 +405,6 @@ static const sal_Unicode aWingDings3Tab[224] = 0, 0, 0, 0 }; - - static const sal_Unicode aWebDingsTab[224] = { // F020 @@ -490,8 +479,6 @@ static const sal_Unicode aWebDingsTab[224] = 0xe3db, 0xe3dc, 0xe3dd, 0xe3de }; - - static const sal_Unicode aAdobeSymbolTab[224] = { //TODO: @@ -567,8 +554,6 @@ static const sal_Unicode aAdobeSymbolTab[224] = 0xe167, 0xe168, 0xe169, 0, }; - - static const sal_Unicode aMonotypeSortsTab[224] = { // F020 @@ -643,8 +628,6 @@ static const sal_Unicode aMonotypeSortsTab[224] = 0x27bc, 0x27bd, 0x27be, 0, }; - - static const sal_Unicode aMTExtraTab[224] = { // F020 @@ -793,8 +776,6 @@ static const sal_Unicode aAdobeSymbolToAppleSymbolTab[224] = 0x23AB, 0x23AC, 0x23AD, 0x00FF }; - - static sal_Unicode ImplStarSymbolToStarBats( sal_Unicode c ) { switch ( c ) @@ -1334,8 +1315,6 @@ StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly) return new StarSymbolToMSMultiFontImpl(bPerfectOnly); } - - sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const { sal_Unicode cRetVal = 0; @@ -1372,8 +1351,6 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const return cRetVal ? cRetVal : cChar; } - - // recode the string assuming the character codes are symbol codes // from an traditional symbol font (i.e. U+F020..U+F0FF) void ConvertChar::RecodeString( OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const @@ -1400,8 +1377,6 @@ void ConvertChar::RecodeString( OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen rStr = aTmpStr.makeStringAndClear(); } - - struct RecodeTable { const char* pOrgName; ConvertChar aCvt;}; static const RecodeTable aStarSymbolRecodeTable[] = @@ -1434,8 +1409,6 @@ static const RecodeTable aAppleSymbolRecodeTable[] = { static ConvertChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats }; - - const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName ) { const ConvertChar* pCvt = NULL; @@ -1480,8 +1453,6 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con return pCvt; } - - FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, sal_uLong nFlags ) { const ConvertChar* pCvt = NULL; @@ -1511,16 +1482,12 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, return (FontToSubsFontConverter)pCvt; } - - void DestroyFontToSubsFontConverter( SAL_UNUSED_PARAMETER FontToSubsFontConverter ) { //TODO: nothing to do for now, because we use static ImplCvtChars } - - sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode cChar ) { @@ -1530,8 +1497,6 @@ sal_Unicode ConvertFontToSubsFontChar( return cChar; } - - OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter ) { if ( !hConverter ) diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 0e02129280c6..ef7a3ae8a5bf 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -320,8 +320,6 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] = { NULL, NULL }, }; - - void GetEnglishSearchFontName( OUString& rName ) { bool bNeedTranslation = false; @@ -442,8 +440,6 @@ void GetEnglishSearchFontName( OUString& rName ) } } - - OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex ) { // check for valid start index @@ -488,8 +484,6 @@ OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex ) return OUString( rTokenStr.getStr() + nTokenStart, nTokenLen ); } - - static bool ImplIsFontToken( const OUString& rName, const OUString& rToken ) { OUString aTempName; @@ -505,8 +499,6 @@ static bool ImplIsFontToken( const OUString& rName, const OUString& rToken ) return false; } - - static void ImplAppendFontToken( OUString& rName, const OUString& rNewToken ) { if ( !rName.isEmpty() ) @@ -522,8 +514,6 @@ void AddTokenFontName( OUString& rName, const OUString& rNewToken ) ImplAppendFontToken( rName, rNewToken ); } - - OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) { OUString aName; @@ -578,8 +568,6 @@ OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags ) return aName; } - - // TODO: use a more generic String hash int FontNameHash::operator()( const OUString& rStr ) const { diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index aa4128c28eb1..3e6dd3c285b8 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -380,8 +380,6 @@ bool MediaDescriptor::isStreamReadOnly() const return bReadOnly; } - - css::uno::Any MediaDescriptor::getComponentDataEntry( const OUString& rName ) const { comphelper::SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() ); diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 1027d4c47ed9..e4c19a5a944a 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -23,11 +23,9 @@ #include <cppuhelper/implbase1.hxx> #include <tools/debug.hxx> - namespace utl { - using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; @@ -39,17 +37,14 @@ namespace utl using ::com::sun::star::util::XCloseListener; using ::com::sun::star::util::CloseVetoException; - //= DisposableComponent - DisposableComponent::DisposableComponent( const Reference< XInterface >& _rxComponent ) :m_xComponent( _rxComponent, UNO_QUERY ) { DBG_ASSERT( m_xComponent.is() || !_rxComponent.is(), "DisposableComponent::DisposableComponent: should be an XComponent!" ); } - DisposableComponent::~DisposableComponent() { if ( m_xComponent.is() ) @@ -102,14 +97,12 @@ namespace utl */ void impl_nf_switchListening( bool _bListen ); - private: CloseableComponentImpl(); // never implemented CloseableComponentImpl( const CloseableComponentImpl& ); // never implemented CloseableComponentImpl& operator=( const CloseableComponentImpl& ); // never implemented }; - CloseableComponentImpl::CloseableComponentImpl( const Reference< XInterface >& _rxComponent ) :m_xCloseable( _rxComponent, UNO_QUERY ) { @@ -122,7 +115,6 @@ namespace utl nf_closeComponent(); } - void CloseableComponentImpl::nf_closeComponent() { if ( !m_xCloseable.is() ) @@ -147,7 +139,6 @@ namespace utl m_xCloseable.clear(); } - void CloseableComponentImpl::impl_nf_switchListening( bool _bListen ) { if ( !m_xCloseable.is() ) @@ -166,7 +157,6 @@ namespace utl } } - void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& #ifdef DBG_UTIL Source @@ -179,7 +169,6 @@ namespace utl throw CloseVetoException(); } - void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& #ifdef DBG_UTIL Source @@ -194,7 +183,6 @@ namespace utl OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" ); } - void SAL_CALL CloseableComponentImpl::disposing( const EventObject& #ifdef DBG_UTIL Source @@ -211,15 +199,12 @@ namespace utl { } - CloseableComponent::~CloseableComponent() { // close the component, deliver ownership to anybody who wants to veto the close m_pImpl->nf_closeComponent(); } - } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index 7cd80c33f625..3a0c45105a17 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/syslocale.hxx> #include <unotools/syslocaleoptions.hxx> #include <comphelper/processfactory.hxx> @@ -30,11 +29,9 @@ using namespace osl; using namespace com::sun::star; - SvtSysLocale_Impl* SvtSysLocale::pImpl = NULL; sal_Int32 SvtSysLocale::nRefCount = 0; - class SvtSysLocale_Impl : public utl::ConfigurationListener { public: @@ -52,8 +49,6 @@ private: void setDateAcceptancePatternsConfig(); }; - - SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL) { pLocaleData = new LocaleDataWrapper( aSysLocaleOptions.GetRealLanguageTag() ); @@ -63,7 +58,6 @@ SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL) aSysLocaleOptions.AddListener( this ); } - SvtSysLocale_Impl::~SvtSysLocale_Impl() { aSysLocaleOptions.RemoveListener( this ); @@ -115,8 +109,6 @@ void SvtSysLocale_Impl::setDateAcceptancePatternsConfig() } } - - SvtSysLocale::SvtSysLocale() { MutexGuard aGuard( GetMutex() ); @@ -125,7 +117,6 @@ SvtSysLocale::SvtSysLocale() ++nRefCount; } - SvtSysLocale::~SvtSysLocale() { MutexGuard aGuard( GetMutex() ); @@ -136,7 +127,6 @@ SvtSysLocale::~SvtSysLocale() } } - // static Mutex& SvtSysLocale::GetMutex() { @@ -155,25 +145,21 @@ Mutex& SvtSysLocale::GetMutex() return *pMutex; } - const LocaleDataWrapper& SvtSysLocale::GetLocaleData() const { return *(pImpl->pLocaleData); } - const LocaleDataWrapper* SvtSysLocale::GetLocaleDataPtr() const { return pImpl->pLocaleData; } - const CharClass& SvtSysLocale::GetCharClass() const { return *(pImpl->GetCharClass()); } - const CharClass* SvtSysLocale::GetCharClassPtr() const { return pImpl->GetCharClass(); @@ -194,8 +180,6 @@ const LanguageTag& SvtSysLocale::GetUILanguageTag() const return pImpl->aSysLocaleOptions.GetRealUILanguageTag(); } - - // static rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding() { diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 569d6e180dd0..b7745491a814 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -22,19 +22,16 @@ namespace utl { - void SAL_CALL OInputStreamHelper::acquire() throw () { InputStreamHelper_Base::acquire(); } - void SAL_CALL OInputStreamHelper::release() throw () { InputStreamHelper_Base::release(); } - sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) { @@ -83,7 +80,6 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength( ) throw(::com::sun::star::io: return aStat.nSize; } - sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) @@ -92,7 +88,6 @@ sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8 return readBytes(aData, nMaxBytesToRead); } - void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) { @@ -106,7 +101,6 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) m_nActPos += nBytesToSkip; } - sal_Int32 SAL_CALL OInputStreamHelper::available() throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) { @@ -117,7 +111,6 @@ sal_Int32 SAL_CALL OInputStreamHelper::available() return m_nAvailable; } - void SAL_CALL OInputStreamHelper::closeInput() throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) { @@ -130,5 +123,4 @@ void SAL_CALL OInputStreamHelper::closeInput() } // namespace utl - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 51868c4a716c..81d2421daf48 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -34,21 +34,18 @@ OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream ) { } - OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner ) :m_pSvStream( pStream ) ,m_bSvStreamOwner( bOwner ) { } - OInputStreamWrapper::~OInputStreamWrapper() { if( m_bSvStreamOwner ) delete m_pSvStream; } - sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { @@ -71,7 +68,6 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& return nRead; } - sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { checkError(); @@ -88,7 +84,6 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int return readBytes(aData, nMaxBytesToRead); } - void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -98,7 +93,6 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star checkError(); } - sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -117,7 +111,6 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE return nAvailable; } - void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -129,14 +122,12 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep m_pSvStream = NULL; } - void OInputStreamWrapper::checkConnected() const { if (!m_pSvStream) throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } - void OInputStreamWrapper::checkError() const { checkConnected(); @@ -146,22 +137,18 @@ void OInputStreamWrapper::checkError() const throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } - //= OSeekableInputStreamWrapper - OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream& _rStream) { SetStream( &_rStream, false ); } - OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner) { SetStream( _pStream, _bOwner ); } - void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,7 +158,6 @@ void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (I checkError(); } - sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition( ) throw (IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +168,6 @@ sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition( ) throw (IOExcepti return (sal_Int64)nPos; } - sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength( ) throw (IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -200,10 +185,8 @@ sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength( ) throw (IOException return (sal_Int64)nEndPos; } - //= OOutputStreamWrapper - OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream): rStream(_rStream) {} @@ -222,19 +205,16 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 } } - void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { rStream.Flush(); checkError(); } - void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { } - void OOutputStreamWrapper::checkError() const { if (rStream.GetError() != ERRCODE_NONE) @@ -242,10 +222,8 @@ void OOutputStreamWrapper::checkError() const throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } - //= OSeekableOutputStreamWrapper - OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream) :OOutputStreamWrapper(_rStream) { @@ -253,7 +231,6 @@ OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream) OSeekableOutputStreamWrapper::~OSeekableOutputStreamWrapper() {} - Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = OOutputStreamWrapper::queryInterface(_rType); @@ -262,26 +239,22 @@ Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) return aReturn; } - void SAL_CALL OSeekableOutputStreamWrapper::acquire( ) throw () { OOutputStreamWrapper::acquire(); } - void SAL_CALL OSeekableOutputStreamWrapper::release( ) throw () { OOutputStreamWrapper::release(); } - void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) { rStream.Seek((sal_uInt32)_nLocation); checkError(); } - sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition( ) throw (IOException, RuntimeException, std::exception) { sal_uInt32 nPos = rStream.Tell(); @@ -289,7 +262,6 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition( ) throw (IOExcept return (sal_Int64)nPos; } - sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength( ) throw (IOException, RuntimeException, std::exception) { sal_uInt32 nCurrentPos = rStream.Tell(); @@ -304,25 +276,21 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength( ) throw (IOExceptio return (sal_Int64)nEndPos; } - OStreamWrapper::OStreamWrapper(SvStream& _rStream) { SetStream( &_rStream, false ); } - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return this; } - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return this; } - void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) { sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength()); @@ -335,7 +303,6 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD } } - void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) { m_pSvStream->Flush(); @@ -343,12 +310,10 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); } - void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) { } - void SAL_CALL OStreamWrapper::truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { m_pSvStream->SetStreamSize(0); diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 4821714576cf..a5ef10f1fba4 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -330,7 +330,6 @@ umask(old_mode); } } - OUString TempFile::CreateTempName( const OUString* pParent ) { // get correct directory diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index c4c6c24ae1c5..8beeec966bd4 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/macros.h> #include <unotools/ucblockbytes.hxx> #include <comphelper/processfactory.hxx> @@ -63,7 +62,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - namespace utl { @@ -160,7 +158,6 @@ public: { return m_xProgressHandler; } }; - /** Helper class for property change notifies when executing UCB commands */ @@ -230,8 +227,6 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc } } - - class Moderator : public osl::Thread { @@ -254,7 +249,6 @@ public: virtual ~Moderator(); - enum ResultType { NORESULT, @@ -276,7 +270,6 @@ public: GENERAL }; - class ConditionRes : public salhelper::Condition { @@ -296,7 +289,6 @@ public: Moderator& m_aModerator; }; - struct Result { ResultType type; Any result; @@ -341,7 +333,6 @@ public: void setStream(const Reference< XStream >& aStream); void setInputStream(const Reference<XInputStream> &rxInputStream); - protected: virtual void SAL_CALL run() SAL_OVERRIDE; virtual void SAL_CALL onTerminated() SAL_OVERRIDE; @@ -365,7 +356,6 @@ private: ::ucbhelper::Content m_aContent; }; - class ModeratorsActiveDataStreamer : public ::cppu::WeakImplHelper1<XActiveDataStreamer> { @@ -395,7 +385,6 @@ public: return m_xStream; } - private: Moderator& m_aModerator; @@ -403,7 +392,6 @@ private: Reference<XStream> m_xStream; }; - class ModeratorsActiveDataSink : public ::cppu::WeakImplHelper1<XActiveDataSink> { @@ -433,21 +421,17 @@ public: return m_xStream; } - private: Moderator& m_aModerator; osl::Mutex m_aMutex; Reference<XInputStream> m_xStream; }; - - ModeratorsActiveDataSink::ModeratorsActiveDataSink(Moderator &theModerator) : m_aModerator(theModerator) { } - ModeratorsActiveDataSink::~ModeratorsActiveDataSink() { } @@ -466,7 +450,6 @@ ModeratorsActiveDataSink::setInputStream ( m_xStream = rxInputStream; } - ModeratorsActiveDataStreamer::ModeratorsActiveDataStreamer( Moderator &theModerator ) @@ -474,7 +457,6 @@ ModeratorsActiveDataStreamer::ModeratorsActiveDataStreamer( { } - ModeratorsActiveDataStreamer::~ModeratorsActiveDataStreamer() { } @@ -493,8 +475,6 @@ ModeratorsActiveDataStreamer::setStream ( m_xStream = rxStream; } - - class ModeratorsInteractionHandler : public ::cppu::WeakImplHelper1<XInteractionHandler> { @@ -513,7 +493,6 @@ private: Moderator& m_aModerator; }; - class ModeratorsProgressHandler : public ::cppu::WeakImplHelper1<XProgressHandler> { @@ -532,12 +511,10 @@ public: virtual void SAL_CALL pop( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - private: Moderator& m_aModerator; }; - ModeratorsProgressHandler::ModeratorsProgressHandler(Moderator &theModerator) : m_aModerator(theModerator) { @@ -547,7 +524,6 @@ ModeratorsProgressHandler::~ModeratorsProgressHandler() { } - void SAL_CALL ModeratorsProgressHandler::push( const Any& Status ) throw ( RuntimeException, std::exception) @@ -555,33 +531,28 @@ void SAL_CALL ModeratorsProgressHandler::push( const Any& Status ) m_aModerator.push(Status); } - void SAL_CALL ModeratorsProgressHandler::update( const Any& Status ) throw (RuntimeException, std::exception) { m_aModerator.update(Status); } - void SAL_CALL ModeratorsProgressHandler::pop( ) throw (RuntimeException, std::exception) { m_aModerator.pop(); } - ModeratorsInteractionHandler::ModeratorsInteractionHandler( Moderator &aModerator) : m_aModerator(aModerator) { } - ModeratorsInteractionHandler::~ModeratorsInteractionHandler() { } - void SAL_CALL ModeratorsInteractionHandler::handle( const Reference<XInteractionRequest >& Request @@ -594,9 +565,6 @@ ModeratorsInteractionHandler::handle( m_aModerator.handle(Request); } - - - Moderator::Moderator( Reference < XContent >& xContent, Reference < XInteractionHandler >& xInteract, @@ -662,12 +630,10 @@ Moderator::Moderator( m_aArg.Argument <<= aOpenArg; } - Moderator::~Moderator() { } - Moderator::Result Moderator::getResult(const sal_uInt32 milliSec) { Result ret; @@ -688,14 +654,12 @@ Moderator::Result Moderator::getResult(const sal_uInt32 milliSec) return ret; } - void Moderator::setReply(ReplyType aReplyType ) { salhelper::ConditionModifier aMod(m_aRep); m_aReplyType = aReplyType; } - void Moderator::handle( const Reference<XInteractionRequest >& Request ) { ReplyType aReplyType; @@ -732,7 +696,6 @@ void Moderator::handle( const Reference<XInteractionRequest >& Request ) } while(aReplyType != REQUESTHANDLED); } - void Moderator::push( const Any& Status ) { { @@ -750,7 +713,6 @@ void Moderator::push( const Any& Status ) setReply(EXIT); } - void Moderator::update( const Any& Status ) { { @@ -768,7 +730,6 @@ void Moderator::update( const Any& Status ) setReply(EXIT); } - void Moderator::pop( ) { { @@ -785,7 +746,6 @@ void Moderator::pop( ) setReply(EXIT); } - void Moderator::setStream(const Reference< XStream >& aStream) { { @@ -803,7 +763,6 @@ void Moderator::setStream(const Reference< XStream >& aStream) setReply(EXIT); } - void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream) { { @@ -821,7 +780,6 @@ void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream) setReply(EXIT); } - void SAL_CALL Moderator::run() { ResultType aResultType; @@ -884,7 +842,6 @@ static bool _UCBOpenContentSync( Reference < XProgressHandler > xProgress, UcbLockBytesHandlerRef xHandler ); - static bool UCBOpenContentSync( UcbLockBytesRef xLockBytes, Reference < XContent > xContent, @@ -1218,14 +1175,12 @@ static bool _UCBOpenContentSync( if ( xControl.is() ) xControl->terminate(); - if ( xProps.is() ) xProps->removePropertiesChangeListener( Sequence< OUString >(), xListener ); return ( bAborted || bException ); } - UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler ) : m_aExpireDate( DateTime::EMPTY ) , m_xInputStream (NULL) @@ -1239,7 +1194,6 @@ UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler ) SetSynchronMode( true ); } - UcbLockBytes::~UcbLockBytes() { if ( !m_bDontClose ) @@ -1281,8 +1235,6 @@ Reference < XInputStream > UcbLockBytes::getInputStream() return m_xInputStream; } - - bool UcbLockBytes::setStream_Impl( const Reference<XStream>& aStream ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1347,7 +1299,6 @@ void UcbLockBytes::SetStreamValid_Impl() m_aInitialized.set(); } - void UcbLockBytes::terminate_Impl() { m_bTerminated = true; @@ -1364,13 +1315,11 @@ void UcbLockBytes::terminate_Impl() m_xHandler->Handle( UcbLockBytesHandler::DONE, this ); } - void UcbLockBytes::SetSynchronMode (bool bSynchron) { SvLockBytes::SetSynchronMode (bSynchron); } - ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const { @@ -1439,7 +1388,6 @@ ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos, return ERRCODE_NONE; } - ErrCode UcbLockBytes::WriteAt(sal_uInt64 const nPos, const void *pBuffer, sal_uLong nCount, sal_uLong *pWritten) { @@ -1479,7 +1427,6 @@ ErrCode UcbLockBytes::WriteAt(sal_uInt64 const nPos, const void *pBuffer, return ERRCODE_NONE; } - ErrCode UcbLockBytes::Flush() const { Reference <XOutputStream > xOutputStream = getOutputStream_Impl(); @@ -1498,7 +1445,6 @@ ErrCode UcbLockBytes::Flush() const return ERRCODE_NONE; } - ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) { SvLockBytesStat aStat; @@ -1532,7 +1478,6 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) return ERRCODE_NONE; } - ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const { if ( IsSynchronMode() ) @@ -1569,7 +1514,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const return ERRCODE_NONE; } - IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { if ( hasInputStream_Impl() && m_xHandler.Is() ) diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 75326bfae4de..3aea7c03f3f9 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -138,8 +138,6 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo return pStream; } - - SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode, UcbLockBytesHandler* pHandler ) { diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 3cbb4d54c418..a40d6b0213b9 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -48,7 +48,6 @@ OTempFileService::~OTempFileService () delete mpTempFile; } - // XInterface css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType ) @@ -151,8 +150,6 @@ throw ( css::uno::RuntimeException, std::exception ) return OUString( mpTempFile->GetFileName() ); }; - - // XInputStream sal_Int32 SAL_CALL OTempFileService::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) @@ -323,7 +320,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs } } - void OTempFileService::checkError () const { if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) @@ -395,7 +391,6 @@ throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) return (sal_Int64)nEndPos; } - // XStream css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream() @@ -443,8 +438,6 @@ throw ( css::uno::RuntimeException, std::exception ) return getSupportedServiceNames_Static(); } - - OUString OTempFileService::getImplementationName_Static () { return OUString ( "com.sun.star.io.comp.TempFile" ); |