summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svtools/inc/svtools/menuoptions.hxx4
-rw-r--r--svtools/inc/svtools/miscopt.hxx4
-rw-r--r--svtools/source/config/menuoptions.cxx16
-rw-r--r--svtools/source/config/miscopt.cxx16
-rwxr-xr-x[-rw-r--r--]tools/inc/tools/solarmutex.hxx2
-rw-r--r--unotools/inc/unotools/misccfg.hxx2
-rwxr-xr-x[-rw-r--r--]unotools/inc/unotools/options.hxx2
-rwxr-xr-x[-rw-r--r--]unotools/inc/unotools/syslocaleoptions.hxx2
-rw-r--r--unotools/source/config/misccfg.cxx3
-rwxr-xr-x[-rw-r--r--]unotools/source/config/options.cxx2
-rwxr-xr-x[-rw-r--r--]unotools/source/config/syslocaleoptions.cxx6
-rwxr-xr-x[-rw-r--r--]vcl/source/app/settings.cxx9
-rw-r--r--vcl/source/control/field2.cxx4
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/makefile.mk3
14 files changed, 35 insertions, 40 deletions
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 6b01ad6079e5..2bc5588519c2 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.hxx
@@ -98,8 +98,8 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
SvtMenuOptions();
virtual ~SvtMenuOptions();
- void AddListener( const Link& rLink );
- void RemoveListener( const Link& rLink );
+ void AddListenerLink( const Link& rLink );
+ void RemoveListenerLink( const Link& rLink );
//---------------------------------------------------------------------------------------------------------
// interface
//---------------------------------------------------------------------------------------------------------
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index bc98d9e50d44..556dd7f0cc7e 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -102,8 +102,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
SvtMiscOptions();
virtual ~SvtMiscOptions();
- void AddListener( const Link& rLink );
- void RemoveListener( const Link& rLink );
+ void AddListenerLink( const Link& rLink );
+ void RemoveListenerLink( const Link& rLink );
//---------------------------------------------------------------------------------------------------------
// interface
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index e9b1b71a1cc6..8c00d7165ba5 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -111,8 +111,8 @@ class SvtMenuOptions_Impl : public ConfigItem
SvtMenuOptions_Impl();
~SvtMenuOptions_Impl();
- void AddListener( const Link& rLink );
- void RemoveListener( const Link& rLink );
+ void AddListenerLink( const Link& rLink );
+ void RemoveListenerLink( const Link& rLink );
//---------------------------------------------------------------------------------------------------------
// overloaded methods of baseclass
@@ -412,12 +412,12 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
return seqPropertyNames;
}
-void SvtMenuOptions_Impl::AddListener( const Link& rLink )
+void SvtMenuOptions_Impl::AddListenerLink( const Link& rLink )
{
aList.Insert( new Link( rLink ) );
}
-void SvtMenuOptions_Impl::RemoveListener( const Link& rLink )
+void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink )
{
for ( USHORT n=0; n<aList.Count(); n++ )
{
@@ -553,12 +553,12 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
return *pMutex;
}
-void SvtMenuOptions::AddListener( const Link& rLink )
+void SvtMenuOptions::AddListenerLink( const Link& rLink )
{
- m_pDataContainer->AddListener( rLink );
+ m_pDataContainer->AddListenerLink( rLink );
}
-void SvtMenuOptions::RemoveListener( const Link& rLink )
+void SvtMenuOptions::RemoveListenerLink( const Link& rLink )
{
- m_pDataContainer->RemoveListener( rLink );
+ m_pDataContainer->RemoveListenerLink( rLink );
}
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index edf5b9e7c40c..ace9f710baa3 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -227,8 +227,8 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemPrintDialogReadOnly() const
{ return m_bIsUseSystemPrintDialogRO; }
- void AddListener( const Link& rLink );
- void RemoveListener( const Link& rLink );
+ void AddListenerLink( const Link& rLink );
+ void RemoveListenerLink( const Link& rLink );
void CallListeners();
//-------------------------------------------------------------------------------------------------------------
@@ -499,12 +499,12 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
-void SvtMiscOptions_Impl::AddListener( const Link& rLink )
+void SvtMiscOptions_Impl::AddListenerLink( const Link& rLink )
{
aList.Insert( new Link( rLink ) );
}
-void SvtMiscOptions_Impl::RemoveListener( const Link& rLink )
+void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
{
for ( USHORT n=0; n<aList.Count(); n++ )
{
@@ -859,12 +859,12 @@ Mutex & SvtMiscOptions::GetInitMutex()
return *pMutex;
}
-void SvtMiscOptions::AddListener( const Link& rLink )
+void SvtMiscOptions::AddListenerLink( const Link& rLink )
{
- m_pDataContainer->AddListener( rLink );
+ m_pDataContainer->AddListenerLink( rLink );
}
-void SvtMiscOptions::RemoveListener( const Link& rLink )
+void SvtMiscOptions::RemoveListenerLink( const Link& rLink )
{
- m_pDataContainer->RemoveListener( rLink );
+ m_pDataContainer->RemoveListenerLink( rLink );
}
diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx
index b1166f2b19a5..42aff1f23f43 100644..100755
--- a/tools/inc/tools/solarmutex.hxx
+++ b/tools/inc/tools/solarmutex.hxx
@@ -40,6 +40,6 @@ namespace tools
static bool Acquire();
static void Release();
};
-};
+}
#endif
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
+}
+
+
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 09262dff7eec..acfb7988b9bd 100644..100755
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1510,15 +1510,6 @@ BOOL HelpSettings::operator ==( const HelpSettings& rSet ) const
// =======================================================================
-static BOOL ImplCompareLocales( const ::com::sun::star::lang::Locale& L1, const ::com::sun::star::lang::Locale& L2 )
-{
- return ( ( L1.Language == L2.Language ) &&
- ( L1.Country == L2.Country ) &&
- ( L1.Variant == L2.Variant ) );
-}
-
-// =======================================================================
-
ImplAllSettingsData::ImplAllSettingsData()
{
mnRefCount = 1;
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 1d8f9a727be4..a7729f4ace24 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1215,7 +1215,7 @@ static BOOL ImplDateProcessKeyInput( Edit*, const KeyEvent& rKEvt, ExtDateFieldF
static BOOL ImplDateGetValue( const XubString& rStr, Date& rDate, ExtDateFieldFormat eDateFormat,
const LocaleDataWrapper& rLocaleDataWrapper, const CalendarWrapper& rCalendarWrapper,
- const AllSettings& rSettings )
+ const AllSettings& )
{
USHORT nDay = 0;
USHORT nMonth = 0;
@@ -1356,7 +1356,7 @@ BOOL DateFormatter::ImplDateReformat( const XubString& rStr, XubString& rOutStr,
// -----------------------------------------------------------------------
XubString DateFormatter::ImplGetDateAsText( const Date& rDate,
- const AllSettings& rSettings ) const
+ const AllSettings& ) const
{
BOOL bShowCentury = FALSE;
switch ( GetExtDateFormat() )
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index d55dec36b65c..7f10a7e5454c 100644..100755
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -122,6 +122,7 @@ EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
$(SLO)$/gfxlink.obj \
$(SLO)$/print.obj \
$(SLO)$/print2.obj \
+ $(SLO)$/configsettings.obj \
$(SLO)$/sallayout.obj \
$(SLO)$/image.obj \
$(SLO)$/impimage.obj \
generated by cgit (git 2.34.1) at 2025-02-07 08:04:50 +0000