[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sfx2/source

[Matúš Kukan]

 sc/inc/refreshtimer.hxx              |   11 -------
 sc/source/core/tool/refreshtimer.cxx |    1 
 sfx2/source/doc/objstor.cxx          |   55 +++++++++++++++++------------------
 3 files changed, 28 insertions(+), 39 deletions(-)

New commits:
commit ed4f0a52f0110557f86a63d9758a71c6b2e09e06
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Oct 29 09:46:27 2013 +0100

    fix indentation
    
    Change-Id: I41c9e96e2202f1dc52ed93c03846d4d37ae6c2cb

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 67da658..1ed9433 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1883,38 +1883,37 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
 sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
 {
     sal_Bool bOk = sal_False;
-    {
-        ModifyBlocker_Impl aBlock( this );
 
-        uno::Reference < embed::XStorage > xNewStor = rMedium.GetStorage();
-        if ( !xNewStor.is() )
-            return sal_False;
+    ModifyBlocker_Impl aBlock( this );
 
-        uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY );
-        if ( xPropSet.is() )
-        {
-            Any a = xPropSet->getPropertyValue("MediaType");
-            OUString aMediaType;
-            if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
-            {
-                SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
-                SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false );
-            }
+    uno::Reference < embed::XStorage > xNewStor = rMedium.GetStorage();
+    if ( !xNewStor.is() )
+        return sal_False;
 
-            pImp->bIsSaving = sal_False;
-            bOk = SaveAsOwnFormat( rMedium );
+    uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY );
+    if ( !xPropSet.is() )
+        return sal_False;
 
-            if ( bCommit )
-            {
-                try {
-                    uno::Reference< embed::XTransactedObject > xTransact( xNewStor, uno::UNO_QUERY_THROW );
-                    xTransact->commit();
-                }
-                catch( uno::Exception& )
-                {
-                    SAL_WARN( "sfx.doc", "The strotage was not commited on DoSaveAs!" );
-                }
-            }
+    Any a = xPropSet->getPropertyValue("MediaType");
+    OUString aMediaType;
+    if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
+    {
+        SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
+        SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false );
+    }
+
+    pImp->bIsSaving = sal_False;
+    bOk = SaveAsOwnFormat( rMedium );
+
+    if ( bCommit )
+    {
+        try {
+            uno::Reference< embed::XTransactedObject > xTransact( xNewStor, uno::UNO_QUERY_THROW );
+            xTransact->commit();
+        }
+        catch( uno::Exception& )
+        {
+            SAL_WARN( "sfx.doc", "The strotage was not commited on DoSaveAs!" );
         }
     }
 
commit dfe56dfebe5a8c5ee0c3c576158d43fa9fa5678a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Oct 28 19:52:17 2013 +0100

    remove empty methods
    
    They are empty since 3a20556d0945f9de7c12fc18018257525dfc5065.
    
    Change-Id: Ibd6c1722d3088d92677338b5b8011cddd6dd98cf

diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index e60fd62..0ee9a37 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -66,10 +66,6 @@ class ScRefreshTimer : public AutoTimer
 private:
     ScRefreshTimerControl * const * ppControl;
 
-    void AppendToControl() {}
-
-    void RemoveFromControl() {}
-
     void Start()
     {
         if ( GetTimeout() )
@@ -104,12 +100,7 @@ public:
 
     void StartRefreshTimer() { Start(); }
 
-    void SetRefreshControl( ScRefreshTimerControl * const * pp )
-    {
-        RemoveFromControl();
-        ppControl = pp;
-        AppendToControl();
-    }
+    void SetRefreshControl( ScRefreshTimerControl * const * pp ) { ppControl = pp; }
 
     void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); }
 
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 8359768..0ee309e 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -37,7 +37,6 @@ ScRefreshTimer::~ScRefreshTimer()
 {
     if ( IsActive() )
         Stop();
-    RemoveFromControl();
 }