[ooo-build-commit] patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Dec 16 08:40:19 PST 2009
patches/dev300/calc-formula-variable-sep-config-check-sc.diff | 10 +
patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff | 60 ++++++++--
2 files changed, 61 insertions(+), 9 deletions(-)
New commits:
commit 4828fc8f82ede54369a91f3da0af3060ec405559
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Dec 16 11:35:44 2009 -0500
Check the options settings only once after each change. (n#556142)
* patches/dev300/calc-formula-variable-sep-config-check-sc.diff:
* patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff:
diff --git a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
index 9d68484..b2cce34 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
@@ -146,7 +146,7 @@ index b0188ee..f4c744e 100644
return *ScGlobal::pLocaleData;
}
diff --git sc/source/ui/docshell/docsh6.cxx sc/source/ui/docshell/docsh6.cxx
-index e356bed..9a17f35 100644
+index e356bed..e2ddad1 100644
--- sc/source/ui/docshell/docsh6.cxx
+++ sc/source/ui/docshell/docsh6.cxx
@@ -56,6 +56,30 @@
@@ -193,12 +193,16 @@ index e356bed..9a17f35 100644
// STATIC DATA -----------------------------------------------------------
-@@ -469,4 +499,62 @@ BOOL ScDocShell::ReloadTabLinks()
+@@ -469,4 +499,68 @@ BOOL ScDocShell::ReloadTabLinks()
return TRUE; //! Fehler erkennen
}
+void ScDocShell::CheckConfigOptions()
+{
++ if (IsConfigOptionsChecked())
++ // no need to check repeatedly.
++ return;
++
+ try
+ {
+ Reference<XMultiServiceFactory> xMSF = ::comphelper::getProcessServiceFactory();
@@ -253,6 +257,8 @@ index e356bed..9a17f35 100644
+ catch (const Exception&)
+ {
+ }
++
++ SetConfigOptionsChecked(true);
+}
+
diff --git a/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff b/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
index e1f9b0b..ec4c784 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
@@ -1,8 +1,8 @@
diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
-index 488acea..d87dff2 100644
+index 488acea..9c7e99f 100644
--- sfx2/inc/sfx2/objsh.hxx
+++ sfx2/inc/sfx2/objsh.hxx
-@@ -354,6 +354,11 @@ public:
+@@ -354,6 +354,13 @@ public:
virtual sal_Bool SwitchPersistance(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual void UpdateLinks();
@@ -11,11 +11,13 @@ index 488acea..d87dff2 100644
+ * handle potentially conflicting option settings.
+ */
+ virtual void CheckConfigOptions();
++ sal_Bool IsConfigOptionsChecked() const;
++ void SetConfigOptionsChecked( sal_Bool bChecked );
sal_Bool SaveChildren(BOOL bObjectsOnly=FALSE);
sal_Bool SaveAsChildren( SfxMedium &rMedium );
diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
-index b511170..04db6d4 100644
+index b511170..72b605e 100644
--- sfx2/source/appl/appserv.cxx
+++ sfx2/source/appl/appserv.cxx
@@ -855,6 +855,23 @@ namespace
@@ -42,7 +44,7 @@ index b511170..04db6d4 100644
void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
-@@ -876,7 +893,11 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
+@@ -876,11 +893,18 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
{
VclAbstractDialog* pDlg =
pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
@@ -55,19 +57,63 @@ index b511170..04db6d4 100644
delete pDlg;
SfxViewFrame* pView = SfxViewFrame::GetFirst();
while ( pView )
+ {
++ SfxObjectShell* pObjSh = pView->GetObjectShell();
++ if (pObjSh)
++ pObjSh->SetConfigOptionsChecked(false);
+ pView->GetBindings().InvalidateAll(FALSE);
+ pView = SfxViewFrame::GetNext( *pView );
+ }
diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index e9856fe..5930374 100644
+index e9856fe..a836b20 100644
--- sfx2/source/doc/objstor.cxx
+++ sfx2/source/doc/objstor.cxx
-@@ -4001,6 +4001,11 @@ void SfxObjectShell::UpdateLinks()
+@@ -4001,6 +4001,22 @@ void SfxObjectShell::UpdateLinks()
{
}
+void SfxObjectShell::CheckConfigOptions()
+{
-+ // not implemented.
++ // not handled. Each app's shell needs to overwrite this method to add handler.
++ SetConfigOptionsChecked(true);
++}
++
++sal_Bool SfxObjectShell::IsConfigOptionsChecked() const
++{
++ return pImp->m_bConfigOptionsChecked;
++}
++
++void SfxObjectShell::SetConfigOptionsChecked( sal_Bool bChecked )
++{
++ pImp->m_bConfigOptionsChecked = bChecked;
+}
+
sal_Bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference< task::XInteractionHandler >& xHandler )
{
if ( !HasBasic() )
+diff --git sfx2/source/doc/objxtor.cxx sfx2/source/doc/objxtor.cxx
+index fb43eaf..3ed6815 100644
+--- sfx2/source/doc/objxtor.cxx
++++ sfx2/source/doc/objxtor.cxx
+@@ -272,6 +272,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
+ ,bSaveVersionOnClose( sal_False )
+ ,m_bSharedXMLFlag( sal_False )
+ ,m_bAllowShareControlFileClean( sal_True )
++ ,m_bConfigOptionsChecked( sal_True )
+ ,lErr(ERRCODE_NONE)
+ ,nEventId ( 0)
+ ,bDoNotTouchDocInfo( sal_False )
+diff --git sfx2/source/inc/objshimp.hxx sfx2/source/inc/objshimp.hxx
+index 8ee3b79..d0099b4 100644
+--- sfx2/source/inc/objshimp.hxx
++++ sfx2/source/inc/objshimp.hxx
+@@ -120,7 +120,8 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
+ bUseUserData:1,
+ bSaveVersionOnClose:1,
+ m_bSharedXMLFlag:1, // whether the flag should be stored in xml file
+- m_bAllowShareControlFileClean:1; // whether the flag should be stored in xml file
++ m_bAllowShareControlFileClean:1, // whether the flag should be stored in xml file
++ m_bConfigOptionsChecked:1; // whether or not the user options are checked after the Options dialog is closed.
+
+ String aNewName; // Der Name, unter dem das Doc gespeichert
+ // werden soll
More information about the ooo-build-commit
mailing list