diff options
author | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-11-03 18:41:58 +0100 |
---|---|---|
committer | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-11-03 18:41:58 +0100 |
commit | 20820038846ae5821d42897623ca2bee2f8e0d87 (patch) | |
tree | 1940712f4a755afae6b21e2f424106338fb175c8 /unotools | |
parent | 490dee4d9d416174505d3ea7bdb98f3890efd8d2 (diff) |
some fixes for warnings and errors found while building on more platforms
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/inc/unotools/misccfg.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | unotools/inc/unotools/options.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | unotools/inc/unotools/syslocaleoptions.hxx | 2 | ||||
-rw-r--r-- | unotools/source/config/misccfg.cxx | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | unotools/source/config/options.cxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | unotools/source/config/syslocaleoptions.cxx | 6 |
6 files changed, 10 insertions, 7 deletions
diff --git a/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx index 2a1383d307a5..14ecb12b388a 100644 --- a/unotools/inc/unotools/misccfg.hxx +++ b/unotools/inc/unotools/misccfg.hxx @@ -63,7 +63,7 @@ public: void SetYear2000( sal_Int32 nSet ); }; -}; +} #endif // _MISCCFG_HXX diff --git a/unotools/inc/unotools/options.hxx b/unotools/inc/unotools/options.hxx index f7254589150d..c0eaf5557033 100644..100755 --- a/unotools/inc/unotools/options.hxx +++ b/unotools/inc/unotools/options.hxx @@ -70,7 +70,7 @@ namespace utl { void NotifyListeners( sal_uInt32 nHint ); ConfigurationBroadcaster(); ~ConfigurationBroadcaster(); - void BlockBroadcasts( bool bBlock ); + virtual void BlockBroadcasts( bool bBlock ); }; namespace detail { diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index 6bb81fdd3ee0..b417e00eec12 100644..100755 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -99,7 +99,7 @@ public: BlockBroadcasts(FALSE) or otherwise pending hints would never be broadcasted again. */ - void BlockBroadcasts( BOOL bBlock ); + virtual void BlockBroadcasts( bool bBlock ); // config value access methods diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index febb3610f6a2..a1c905d292f3 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -309,4 +309,5 @@ void MiscCfg::SetYear2000( sal_Int32 nSet ) pImpl->SetYear2000( nSet ); } -}
\ No newline at end of file +} + diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx index 3b41d14bdd6c..7c004e1475a6 100644..100755 --- a/unotools/source/config/options.cxx +++ b/unotools/source/config/options.cxx @@ -37,7 +37,7 @@ namespace utl { - DECLARE_LIST( IMPL_ConfigurationListenerList, ConfigurationListener* ); + DECLARE_LIST( IMPL_ConfigurationListenerList, ConfigurationListener* ) } using utl::detail::Options; diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index f358fe24df4f..7b14c9cb8c2f 100644..100755 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -536,7 +536,7 @@ void SvtSysLocaleOptions::Commit() } -void SvtSysLocaleOptions::BlockBroadcasts( BOOL bBlock ) +void SvtSysLocaleOptions::BlockBroadcasts( bool bBlock ) { MutexGuard aGuard( GetMutex() ); pOptions->BlockBroadcasts( bBlock ); @@ -700,4 +700,6 @@ LanguageType SvtSysLocaleOptions::GetRealLanguage() const LanguageType SvtSysLocaleOptions::GetRealUILanguage() const { return pOptions->GetRealUILanguage(); -}
\ No newline at end of file +} + + |