David Tardon
13 years ago
parent
1ee7b16e88
commit
ccefb282c9
@ -1,58 +0,0 @@
|
|||||||
From 4ce9896c6ac42d450d2056ee8d700b9f6dce8e2d Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Wed, 11 Jan 2012 11:42:09 +0100
|
|
||||||
Subject: [PATCH] Revert "fast_merge: fix mis-merge of first module's strings"
|
|
||||||
|
|
||||||
This is not enough, because the file is still wrong.
|
|
||||||
|
|
||||||
This reverts commit 47a8454f5f76030203ce6458cf63d4348bdacffe.
|
|
||||||
---
|
|
||||||
l10ntools/scripts/fast_merge.pl | 10 ++++------
|
|
||||||
1 files changed, 4 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
|
|
||||||
index 73b824e..5dc63cf 100644
|
|
||||||
--- a/l10ntools/scripts/fast_merge.pl
|
|
||||||
+++ b/l10ntools/scripts/fast_merge.pl
|
|
||||||
@@ -91,7 +91,7 @@ while( hasLines() )
|
|
||||||
}
|
|
||||||
if( $#current+1 ne 0 )
|
|
||||||
{
|
|
||||||
- ( $path , $localize_file ) = make_paths($current[ 0 ]->module);
|
|
||||||
+ ( $path , $localize_file ) = make_paths();
|
|
||||||
add_to_buffer();
|
|
||||||
write_buffer( $path , $localize_file );
|
|
||||||
}
|
|
||||||
@@ -240,8 +240,7 @@ sub hasLines
|
|
||||||
|
|
||||||
sub make_paths
|
|
||||||
{
|
|
||||||
- my $module = shift ;
|
|
||||||
- my $localizeFile = $merge_dir."\\".$module."\\".$current[ 0 ]->file;
|
|
||||||
+ my $localizeFile = $merge_dir."\\".$current[ 0 ]->module."\\".$current[ 0 ]->file;
|
|
||||||
my $path = getDir( $localizeFile );
|
|
||||||
$path =~ s/\\/\//g;
|
|
||||||
|
|
||||||
@@ -252,9 +251,8 @@ sub make_paths
|
|
||||||
sub write_lines
|
|
||||||
{
|
|
||||||
if( $first_run ){
|
|
||||||
- my $module = $current[ 0 ]->module;
|
|
||||||
add_to_buffer();
|
|
||||||
- my( $path , $localize_file ) = make_paths($module);
|
|
||||||
+ my( $path , $localize_file ) = make_paths();
|
|
||||||
$last_path = $path;
|
|
||||||
$last_localize_file = $localize_file;
|
|
||||||
mkpath $path;
|
|
||||||
@@ -264,7 +262,7 @@ sub write_lines
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return , if ( $#current+1 eq 0 );
|
|
||||||
- my( $path , $localize_file ) = make_paths($current[ 0 ]->module);
|
|
||||||
+ my( $path , $localize_file ) = make_paths();
|
|
||||||
if( $path eq $last_path )
|
|
||||||
{
|
|
||||||
add_to_buffer();
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
From b2dd236acdef807b51e27692ace5afd82f96585a Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Tue, 10 Jan 2012 19:32:51 +0100
|
|
||||||
Subject: [PATCH] fix for gcc 4.7/C++11: these are not string literal
|
|
||||||
operators
|
|
||||||
|
|
||||||
---
|
|
||||||
binfilter/bf_sch/source/core/sch_globfunc.cxx | 4 ++--
|
|
||||||
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 4 ++--
|
|
||||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
|
||||||
index 6a81bf1..ac87608 100644
|
|
||||||
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
|
||||||
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
|
||||||
@@ -1193,7 +1193,7 @@ namespace binfilter {
|
|
||||||
/*N*/ const USHORT* pRanges = rSet.GetRanges();
|
|
||||||
/*N*/ for( long n = 0; pRanges[ n ] && n<32; n+=2 )
|
|
||||||
/*N*/ {
|
|
||||||
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%"SAL_PRIdINT32"; %"SAL_PRIdINT32"] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
|
|
||||||
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%" SAL_PRIdINT32 "; %" SAL_PRIdINT32 "] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
|
|
||||||
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
|
|
||||||
/*N*/ }
|
|
||||||
/*N*/
|
|
||||||
@@ -1219,7 +1219,7 @@ namespace binfilter {
|
|
||||||
/*N*/ nCns++;
|
|
||||||
/*N*/ if( nCnt < 100 )
|
|
||||||
/*N*/ {
|
|
||||||
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%"SAL_PRIdINT32", ", (sal_uInt32) nWhich );
|
|
||||||
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%" SAL_PRIdINT32 ", ", (sal_uInt32) nWhich );
|
|
||||||
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
|
|
||||||
/*N*/ }
|
|
||||||
/*N*/
|
|
||||||
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
|
||||||
index f2e9607..ce3ce33 100644
|
|
||||||
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
|
||||||
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
|
||||||
@@ -1644,7 +1644,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
|
|
||||||
/*N*/ if( pCrypter )
|
|
||||||
/*N*/ {
|
|
||||||
/*?*/ sal_Char buf[ 17 ];
|
|
||||||
-/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
|
|
||||||
+/*?*/ snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" SAL_PRIxUINT32, nDate, nTime );
|
|
||||||
/*?*/ rtl::OStringBuffer aTest( buf );
|
|
||||||
/*?*/ pCrypter->Encrypt( aTest );
|
|
||||||
/*?*/ return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
|
|
||||||
@@ -1662,7 +1662,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
|
|
||||||
/*N*/ {
|
|
||||||
/*?*/ pCrypter = new Crypter( pRoot->GetKey() );
|
|
||||||
/*?*/ sal_Char buf[ 17 ];
|
|
||||||
-/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
|
|
||||||
+/*?*/ snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" SAL_PRIxUINT32, nDate, nTime );
|
|
||||||
/*?*/ rtl::OStringBuffer aTest( buf );
|
|
||||||
/*?*/ pCrypter->Encrypt( aTest );
|
|
||||||
/*?*/ memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 0669fdb4874f8169ce1e49f3ae946c87ce1478ce Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Wed, 11 Jan 2012 07:47:38 +0100
|
|
||||||
Subject: [PATCH] fix for gcc 4.7/C++11: this is not string literal operator
|
|
||||||
|
|
||||||
---
|
|
||||||
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
|
|
||||||
index a1e5977..0e2553d 100644
|
|
||||||
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
|
|
||||||
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
|
|
||||||
@@ -297,7 +297,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
|
|
||||||
deleteRootsModule();
|
|
||||||
|
|
||||||
#if defined SYSTEM_MOZILLA
|
|
||||||
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
|
|
||||||
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION));
|
|
||||||
#else
|
|
||||||
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION));
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
@ -1,85 +0,0 @@
|
|||||||
From 196885980bbb51562264cb5aad9a3e01133d1d7d Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Wed, 11 Jan 2012 14:04:54 +0100
|
|
||||||
Subject: [PATCH] fix writing of strings from the first module
|
|
||||||
|
|
||||||
---
|
|
||||||
l10ntools/scripts/fast_merge.pl | 21 +++++++++++++--------
|
|
||||||
1 files changed, 13 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
|
|
||||||
index 5dc63cf..cc632e4 100644
|
|
||||||
--- a/l10ntools/scripts/fast_merge.pl
|
|
||||||
+++ b/l10ntools/scripts/fast_merge.pl
|
|
||||||
@@ -89,11 +89,10 @@ while( hasLines() )
|
|
||||||
}
|
|
||||||
write_lines();
|
|
||||||
}
|
|
||||||
-if( $#current+1 ne 0 )
|
|
||||||
+# write content of the last localize.sdf file
|
|
||||||
+if( $#buffer ge 0 )
|
|
||||||
{
|
|
||||||
- ( $path , $localize_file ) = make_paths();
|
|
||||||
- add_to_buffer();
|
|
||||||
- write_buffer( $path , $localize_file );
|
|
||||||
+ write_buffer( $last_path , $last_localize_file );
|
|
||||||
}
|
|
||||||
release_lock();
|
|
||||||
exit( 0 );
|
|
||||||
@@ -248,15 +247,14 @@ sub make_paths
|
|
||||||
|
|
||||||
return ( $path , $localizeFile );
|
|
||||||
}
|
|
||||||
+
|
|
||||||
sub write_lines
|
|
||||||
{
|
|
||||||
if( $first_run ){
|
|
||||||
- add_to_buffer();
|
|
||||||
my( $path , $localize_file ) = make_paths();
|
|
||||||
$last_path = $path;
|
|
||||||
$last_localize_file = $localize_file;
|
|
||||||
- mkpath $path;
|
|
||||||
- write_buffer( $path , $localize_file );
|
|
||||||
+ add_to_buffer();
|
|
||||||
$first_run = '';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
@@ -269,7 +267,6 @@ sub write_lines
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- mkpath $path;
|
|
||||||
write_buffer( $last_path , $last_localize_file );
|
|
||||||
add_to_buffer();
|
|
||||||
$last_path = $path;
|
|
||||||
@@ -277,6 +274,11 @@ sub write_lines
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+# Adds all lines that contain strings from one source file from every input file.
|
|
||||||
+# TODO: Would it not be better to add lines for all files from a directory (i.e., replace
|
|
||||||
+# "$afile eq $elem->file" by "$adir eq $elem->dir")? We could get rid of the delayed
|
|
||||||
+# writing then. But maybe there is a reason for doing it this way...
|
|
||||||
sub add_to_buffer
|
|
||||||
{
|
|
||||||
my $plainline;
|
|
||||||
@@ -293,12 +295,15 @@ sub add_to_buffer
|
|
||||||
} while ( !$elem->endoffile && $amodule eq $elem->module && $afile eq $elem->file );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+# Writes the buffer to currently selected localize.sdf file.
|
|
||||||
sub write_buffer
|
|
||||||
{
|
|
||||||
my $path = shift;
|
|
||||||
my $localize_file = shift;
|
|
||||||
my $cnt = $#buffer+1;
|
|
||||||
print "Write to $path $cnt lines\n";
|
|
||||||
+ mkpath $path;
|
|
||||||
open FILE , ">>$localize_file" or die "Can't open file '$localize_file'\n";
|
|
||||||
foreach ( @buffer )
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
From df97997452b443f184c07c8cb1eedaaa0621f05f Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Fri, 13 Jan 2012 07:53:08 +0100
|
|
||||||
Subject: [PATCH] refactor slightly to avoid link problems with gcc 4.7
|
|
||||||
|
|
||||||
---
|
|
||||||
sc/source/ui/inc/anyrefdg.hxx | 23 ++++++++---
|
|
||||||
sc/source/ui/miscdlgs/anyrefdg.cxx | 80 ++++++++++++++---------------------
|
|
||||||
2 files changed, 49 insertions(+), 54 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
|
|
||||||
index 3dd531b..383f6b3 100644
|
|
||||||
--- a/sc/source/ui/inc/anyrefdg.hxx
|
|
||||||
+++ b/sc/source/ui/inc/anyrefdg.hxx
|
|
||||||
@@ -121,7 +121,6 @@ class SC_DLLPUBLIC ScRefHandler : //public SfxModelessDialog,
|
|
||||||
public:
|
|
||||||
operator Window *(){ return &m_rWindow; }
|
|
||||||
Window * operator ->() { return static_cast<Window *>(*this); }
|
|
||||||
- template<class,bool> friend class ScRefHdlrImplBase;
|
|
||||||
friend class formula::RefButton;
|
|
||||||
friend class formula::RefEdit;
|
|
||||||
|
|
||||||
@@ -152,6 +151,9 @@ protected:
|
|
||||||
|
|
||||||
bool ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc );
|
|
||||||
|
|
||||||
+ void preNotify(const NotifyEvent& rEvent, const bool bBindRef);
|
|
||||||
+ void stateChanged(const StateChangedType nStateChange, const bool bBindRef);
|
|
||||||
+
|
|
||||||
public:
|
|
||||||
ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW,
|
|
||||||
Window* pParent, sal_uInt16 nResId*/, bool bBindRef );
|
|
||||||
@@ -222,6 +224,20 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent,
|
|
||||||
template<class TWindow, bool bBindRef >
|
|
||||||
ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){}
|
|
||||||
|
|
||||||
+template<class TWindow, bool bBindRef>
|
|
||||||
+long ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt )
|
|
||||||
+{
|
|
||||||
+ ScRefHandler::preNotify( rNEvt, bBindRef );
|
|
||||||
+ return TWindow::PreNotify( rNEvt );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+template<class TWindow, bool bBindRef>
|
|
||||||
+void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nStateChange )
|
|
||||||
+{
|
|
||||||
+ TWindow::StateChanged( nStateChange );
|
|
||||||
+ ScRefHandler::stateChanged( nStateChange, bBindRef );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
//============================================================================
|
|
||||||
template<class TDerived, class TBase, bool bBindRef = true>
|
|
||||||
struct ScRefHdlrImpl: ScRefHdlrImplBase<TBase, bBindRef >
|
|
||||||
@@ -257,11 +273,6 @@ inline bool ScRefHandler::CanInputDone( sal_Bool bForced )
|
|
||||||
return m_aHelper.CanInputDone( bForced );
|
|
||||||
}
|
|
||||||
|
|
||||||
-template <> SC_DLLPUBLIC void ScRefHdlrImplBase<SfxModelessDialog,true>::StateChanged( StateChangedType nStateChange );
|
|
||||||
-template <> SC_DLLPUBLIC long ScRefHdlrImplBase<SfxModelessDialog,true>::PreNotify( NotifyEvent& rNEvt );
|
|
||||||
-template <> SC_DLLPUBLIC void ScRefHdlrImplBase<SfxTabDialog,false>::StateChanged( StateChangedType nStateChange );
|
|
||||||
-template <> SC_DLLPUBLIC long ScRefHdlrImplBase<SfxTabDialog,false>::PreNotify( NotifyEvent& rNEvt );
|
|
||||||
-
|
|
||||||
#endif // SC_ANYREFDG_HXX
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
||||||
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
|
|
||||||
index 91e3858..b0a4ad6 100644
|
|
||||||
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
|
|
||||||
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
|
|
||||||
@@ -865,54 +865,38 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
|
|
||||||
m_aHelper.ToggleCollapsed( pEdit, pButton );
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if defined( _MSC_VER )
|
|
||||||
-#define INTRODUCE_TEMPLATE
|
|
||||||
-#else
|
|
||||||
-#define INTRODUCE_TEMPLATE template <>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
-#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \
|
|
||||||
-INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEvent& rNEvt )\
|
|
||||||
-{\
|
|
||||||
- if( bBindRef || m_bInRefMode )\
|
|
||||||
- {\
|
|
||||||
- sal_uInt16 nSwitch=rNEvt.GetType();\
|
|
||||||
- if(nSwitch==EVENT_GETFOCUS)\
|
|
||||||
- {\
|
|
||||||
- pActiveWin=rNEvt.GetWindow();\
|
|
||||||
- }\
|
|
||||||
- }\
|
|
||||||
- return TWindow::PreNotify(rNEvt);\
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \
|
|
||||||
-INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( StateChangedType nStateChange )\
|
|
||||||
-{\
|
|
||||||
- TWindow::StateChanged( nStateChange );\
|
|
||||||
-\
|
|
||||||
- if( !bBindRef && !m_bInRefMode ) return;\
|
|
||||||
- \
|
|
||||||
- if(nStateChange == STATE_CHANGE_VISIBLE)\
|
|
||||||
- {\
|
|
||||||
- if(m_rWindow.IsVisible())\
|
|
||||||
- {\
|
|
||||||
- m_aHelper.enableInput( false );\
|
|
||||||
- m_aHelper.EnableSpreadsheets();\
|
|
||||||
- m_aHelper.SetDispatcherLock( sal_True );\
|
|
||||||
- aTimer.Start();\
|
|
||||||
- }\
|
|
||||||
- else\
|
|
||||||
- {\
|
|
||||||
- m_aHelper.enableInput( sal_True );\
|
|
||||||
- m_aHelper.SetDispatcherLock( false ); /*//! here and in DoClose ?*/\
|
|
||||||
- }\
|
|
||||||
- }\
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-IMPL_TWINDOW_PRENOTIFY( SfxModelessDialog, true )
|
|
||||||
-IMPL_TWINDOW_PRENOTIFY( SfxTabDialog, false )
|
|
||||||
-IMPL_TWINDOW_STATECHANGED( SfxModelessDialog, true )
|
|
||||||
-IMPL_TWINDOW_STATECHANGED( SfxTabDialog, false )
|
|
||||||
+void ScRefHandler::preNotify(const NotifyEvent& rNEvt, const bool bBindRef)
|
|
||||||
+{
|
|
||||||
+ if( bBindRef || m_bInRefMode )
|
|
||||||
+ {
|
|
||||||
+ sal_uInt16 nSwitch=rNEvt.GetType();
|
|
||||||
+ if(nSwitch==EVENT_GETFOCUS)
|
|
||||||
+ {
|
|
||||||
+ pActiveWin=rNEvt.GetWindow();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool bBindRef)
|
|
||||||
+{
|
|
||||||
+ if( !bBindRef && !m_bInRefMode ) return;
|
|
||||||
+
|
|
||||||
+ if(nStateChange == STATE_CHANGE_VISIBLE)
|
|
||||||
+ {
|
|
||||||
+ if(m_rWindow.IsVisible())
|
|
||||||
+ {
|
|
||||||
+ m_aHelper.enableInput( false );
|
|
||||||
+ m_aHelper.EnableSpreadsheets();
|
|
||||||
+ m_aHelper.SetDispatcherLock( sal_True );
|
|
||||||
+ aTimer.Start();
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ m_aHelper.enableInput( sal_True );
|
|
||||||
+ m_aHelper.SetDispatcherLock( false ); /*//! here and in DoClose ?*/
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
||||||
IMPL_LINK( ScRefHandler, UpdateFocusHdl, Timer*, EMPTYARG )
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From 4a71d128bba69f7b91fe46fad5731caac6ca6ba2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Tue, 10 Jan 2012 13:31:33 +0100
|
|
||||||
Subject: [PATCH] workaround internal compiler error with gcc 4.7
|
|
||||||
|
|
||||||
---
|
|
||||||
framework/source/uielement/toolbarmanager.cxx | 3 ++-
|
|
||||||
framework/source/uielement/toolbarmerger.cxx | 3 ++-
|
|
||||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
|
|
||||||
index 8d4f984..0104b65 100644
|
|
||||||
--- a/framework/source/uielement/toolbarmanager.cxx
|
|
||||||
+++ b/framework/source/uielement/toolbarmanager.cxx
|
|
||||||
@@ -1379,7 +1379,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
|
|
||||||
{
|
|
||||||
aCmdInfo.nId = nId;
|
|
||||||
aCmdInfo.nWidth = nWidth;
|
|
||||||
- m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo ));
|
|
||||||
+ const CommandToInfoMap::value_type aValue( aCommandURL, aCmdInfo );
|
|
||||||
+ m_aCommandMap.insert( aValue );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
|
|
||||||
index 4b5da50..7e2a5f7 100644
|
|
||||||
--- a/framework/source/uielement/toolbarmerger.cxx
|
|
||||||
+++ b/framework/source/uielement/toolbarmerger.cxx
|
|
||||||
@@ -516,7 +516,8 @@ bool ToolBarMerger::MergeItems(
|
|
||||||
{
|
|
||||||
CommandInfo aCmdInfo;
|
|
||||||
aCmdInfo.nId = rItemId;
|
|
||||||
- rCommandMap.insert( CommandToInfoMap::value_type( rItem.aCommandURL, aCmdInfo ));
|
|
||||||
+ const CommandToInfoMap::value_type aValue( rItem.aCommandURL, aCmdInfo );
|
|
||||||
+ rCommandMap.insert( aValue );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.7.7.5
|
|
||||||
|
|
||||||
Loading…
Reference in new issue