[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 6 commits - comphelper/source rsc/source tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_sspretty.mk tools/inc tools/Library_tl.mk unotools/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Feb 15 15:48:33 PST 2011
comphelper/source/misc/uieventslogger.cxx | 2 -
rsc/source/parser/rscicpx.cxx | 1
tools/Executable_mkunroll.mk | 1
tools/Executable_rscdep.mk | 1
tools/Executable_sspretty.mk | 1
tools/Library_tl.mk | 1
tools/inc/tools/fldunit.hxx | 2 -
unotools/source/config/fltrcfg.cxx | 5 ---
unotools/source/config/javaoptions.cxx | 1
unotools/source/config/syslocaleoptions.cxx | 42 ----------------------------
10 files changed, 2 insertions(+), 55 deletions(-)
New commits:
commit 26a08bde69daf6f7876d3ec9e5a1ac67859e57d2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:48:14 2011 -0600
mis-merge: duplicate hunk and extra #ifdef left over from a header-guard
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 88e1a3d..fff0308 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -123,11 +123,6 @@ void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >& )
// no listeners supported yet
}
-void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >& )
-{
- // no listeners supported yet
-}
-
void SvtAppFilterOptions_Impl::Load()
{
Sequence<OUString> aNames(2);
diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index fc64e01..3f9208e 100644
--- a/unotools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_unotools.hxx"
-#ifndef _unotools_JAVAPTIONS_HXX
#include <unotools/javaoptions.hxx>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Sequence.hxx>
commit 94b0feb6d3be5b1baece5d05118674da94ddd49c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:47:37 2011 -0600
mis-merge: sSingleLineId has been removed as deprecated setting
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index c80509e..9cbe33c 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -2239,7 +2239,6 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
pClassTabControl->SetVariable( nId, pCont, NULL, 0,
RSC_TABCONTROL_ITEMLIST );
- INS_WINBIT( pClassTabControl, SingleLine );
INS_WINBIT( pClassTabControl, DropDown );
}
commit 4ccf6b7fc33b0c238604e5861eb1d259b26193e4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:46:45 2011 -0600
mis-merge: missing new element of the FieldUnit enum
diff --git a/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx
index 73777fb..281050d 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/tools/inc/tools/fldunit.hxx
@@ -34,7 +34,7 @@
enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
+ FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
FUNIT_PERCENT, FUNIT_100TH_MM };
#endif // _TOOLS_FLDUNIT_HXX
commit 6d5749a2fe3ca584f56ccc08d33b3dad143e70f8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:32:41 2011 -0600
mis-merge: duplicate hunk
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 6853aa0..13de1be 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -693,46 +693,4 @@ LanguageType SvtSysLocaleOptions::GetRealUILanguage() const
return pOptions->GetRealUILanguage();
}
-void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint )
-{
- if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
- {
- const Link& rLink = GetCurrencyChangeLink();
- if ( rLink.IsSet() )
- rLink.Call( NULL );
- }
-
- ::utl::detail::Options::ConfigurationChanged( p, nHint );
-}
-
-com::sun::star::lang::Locale SvtSysLocaleOptions::GetLocale() const
-{
- return lcl_str_to_locale( GetLocaleConfigString() );
-}
-
-com::sun::star::lang::Locale SvtSysLocaleOptions::GetUILocale() const
-{
- return lcl_str_to_locale( GetUILocaleConfigString() );
-}
-
-com::sun::star::lang::Locale SvtSysLocaleOptions::GetRealLocale() const
-{
- return pOptions->GetRealLocale();
-}
-
-com::sun::star::lang::Locale SvtSysLocaleOptions::GetRealUILocale() const
-{
- return pOptions->GetRealUILocale();
-}
-
-LanguageType SvtSysLocaleOptions::GetRealLanguage() const
-{
- return pOptions->GetRealLanguage();
-}
-
-LanguageType SvtSysLocaleOptions::GetRealUILanguage() const
-{
- return pOptions->GetRealUILanguage();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0a13371539fc55a1dbb7dddcd73ed6d9625edb75
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:32:21 2011 -0600
mis-merge: missing )
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index 6fdd2b0..702af37 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.cxx
@@ -211,7 +211,7 @@ namespace comphelper
const OUString UiEventsLogger_Impl::URL_UNO(RTL_CONSTASCII_USTRINGPARAM(".uno:"));
const OUString UiEventsLogger_Impl::URL_FILE(RTL_CONSTASCII_USTRINGPARAM("file:"));
- const OUString UiEventsLogger_Impl::URL_SPECIAL(RTL_CONSTASCII_USTRINGPARAM(".special:");
+ const OUString UiEventsLogger_Impl::URL_SPECIAL(RTL_CONSTASCII_USTRINGPARAM(".special:"));
// public UiEventsLogger interface
commit c25e94566213a6c53babeaebf5ec99bc295b2b12
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Feb 15 17:32:08 2011 -0600
mis-merge: we do not link against vos3 anymore
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index df59d0d..757ce10 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
sal \
stl \
tl \
- vos3 \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 95ea7b7..615f240 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
sal \
stl \
tl \
- vos3 \
))
$(eval $(call gb_Executable_add_exception_objects,rscdep,\
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index e59a18c..e3f176c 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
sal \
stl \
tl \
- vos3 \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 4117bbd..33cc45f 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
stl \
cppu \
sal \
- vos3 \
))
More information about the Libreoffice-commits
mailing list